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

[Rex Dieter]

commit bf0b20efc31aed7ae0f78846fd68c63177bcaf16
Merge: 1f9cc46 cd8cd5e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:40:05 2014 -0500

    Merge branch 'master' into f20

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