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

[Rex Dieter]

commit 44beca88fce1323a6dc29eb9afcbdc91b6b8a8e8
Merge: a707519 949b3ef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 13:21:19 2014 -0500

    Merge branch 'master' into f20

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