[kmouth/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit 055abc5df9113f8fe07bb8d624832567880b860c
Merge: bf0b20e 8495a2b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:24:40 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    3 +++
 kmouth.spec |   14 +++++++++++++-
 sources     |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---