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

[Rex Dieter]

commit 88d728297660c3a50d19781c8d338cde62961a01
Merge: 3d706e9 0d89a29
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:23:07 2014 -0500

    Merge branch 'master' into f20

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