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

[Rex Dieter]

commit 5954749f0338a97ea85f857cb75251a8bb2da180
Merge: ad07f5f 6e065a3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 22:52:49 2014 -0500

    Merge branch 'master' into f20

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