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

[Rex Dieter]

commit 5f1d0f3c0f8ae140de6ca2d8ba846438c9021207
Merge: 30e06a7 d6bc4ef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 10:24:26 2014 -0600

    Merge branch 'master' into f20

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