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

[Rex Dieter]

commit d2d407667d579c70954a2893ed5ce057d0d1e15b
Merge: e6cb937 d2d354e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 15:46:29 2015 -0600

    Merge branch 'master' into f20

 .gitignore  |    2 ++
 kapman.spec |   12 +++++++++---
 sources     |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---