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

[Rex Dieter]

commit e5cd5b169081a3b3bc0321a7f8f00e1a6d13b94a
Merge: be6ff03 e73b0cd
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:23:51 2014 -0500

    Merge branch 'master' into f20

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