[smokeqt/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit ad07f5f4a58d99267c3c778d32e28947f615b8cf
Merge: 7993011 213689a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 13:22:46 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    6 ++++++
 smokeqt.spec |   23 ++++++++++++++++++++++-
 sources      |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---