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

[Rex Dieter]

commit 9296cea5e783018d223c9a2d124fe49dde728c1a
Merge: 5355ba9 5acffa0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:38:40 2014 -0500

    Merge branch 'master' into f20

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