[kmouth/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit f7a3825aa65b38bf2cb2d39cfe11d9202d859423
Merge: 050f296 c323aaf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:51:26 2012 -0600

    Merge branch 'f18' into f17

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