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

[Rex Dieter]

commit 1f9cc463da9fd3501ae417865252f814954ba5e4
Merge: daa0c99 e65f0ab
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:06:04 2014 -0500

    Merge branch 'master' into f20

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