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

[Rex Dieter]

commit 23f33dc16b4cc0e2ebb6499e3754e4609a53bd93
Merge: f65457b 68112f1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 08:41:50 2014 -0500

    Merge branch 'master' into f20

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