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

[konradm]

commit ed1252687bcd6a7f57ca4befb051c76afc34ea60
Merge: bea36bc ec24fb3
Author: Conrad Meyer <cemeyer at uw.edu>
Date:   Tue Jun 5 09:53:09 2012 -0700

    Merge branch 'master' into f17

 xchat-ruby-1-2-ruby192-fix.diff |   11 +++++++++++
 xchat-ruby.spec                 |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---