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

[Rex Dieter]

commit 384bb881d4559209f5549611527a89dcb5bc0b44
Merge: 743b364 f580fc0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 08:23:18 2014 -0500

    Merge branch 'master' into f20

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