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

[Rex Dieter]

commit 9f48a7af32dc1e581b10b7d4b9426d663ecf11cd
Merge: 44beca8 59661bc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 20:50:38 2014 -0500

    Merge branch 'master' into f20

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