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

[Rex Dieter]

commit f80303bd16853f21480d9744f5205ba1a4f91cdb
Merge: 7cd9024 3119e6d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 09:22:20 2015 -0600

    Merge branch 'master' into f20

 .gitignore  |    1 +
 kmouth.spec |    9 ++++++---
 sources     |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---