[xchat-ruby/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit bea36bc97da5b2220bd4ba33970a1820da8cb241
Merge: 5c1f30e 50444cf
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Feb 8 09:31:02 2012 +0100

    Merge branch 'master' into f17

 xchat-ruby.spec |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)
---