[ruby-qt/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 2107efe541a343fff19e86f8f99869e32227003f
Merge: 2cf7609 d903104
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 17:59:13 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    1 +
 ruby-qt.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---