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

[Rex Dieter]

commit af9c782a19ae61ccbe63b5e030534882ea1ea040
Merge: f462e4d 27150ac
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 21:52:18 2014 -0500

    Merge branch 'master' into f20

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