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

[Rex Dieter]

commit f65457bb5fb0421a1afcf506e9cd174d188f5fe8
Merge: aa2e33a cff3a99
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 17:18:09 2014 -0500

    Merge branch 'master' into f20

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