[rubygem-xmpp4r-simple/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 8693465d98bb659a44872718d2026028d9c0850d
Merge: 233481b 67fdc80
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Feb 8 15:57:41 2012 +0100

    Merge branch 'master' into f17

 rubygem-xmpp4r-simple.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---