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

[Rex Dieter]

commit 5355ba907f4cdeabb36d4d3ded3455e3db877fe4
Merge: e0ff95a a079a4c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:04:05 2014 -0500

    Merge branch 'master' into f20

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