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

[Rex Dieter]

commit 8db013aa1cf678779cf41c3456df4feb4b50a0f8
Merge: 4accce7 fda0992
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 15:52:11 2014 -0600

    Merge branch 'master' into f20

 .gitignore   |   16 ++++++----------
 ruby-qt.spec |   23 ++++++++++++++++++++++-
 sources      |    2 +-
 3 files changed, 29 insertions(+), 12 deletions(-)
---