[kapman/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit be6ff033cbff64ef3b40f08a9f79a077853e3ee5
Merge: 5a5456b 19bb9c7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:41:27 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    6 ++++++
 kapman.spec |   23 ++++++++++++++++++++++-
 sources     |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---