[kapman/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit e751e174d0217137bb7643ca6bc625f0a9d8c18d
Merge: 25a03cf e575c3f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:11:15 2013 -0500

    Merge branch 'master' into f19

 .gitignore  |    5 +++++
 kapman.spec |   17 ++++++++++++++++-
 sources     |    2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
---