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

[Rex Dieter]

commit 3d706e97acf75381f54d7e3065ae5f574bc60979
Merge: cbb84e1 d87b60c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:40:23 2014 -0500

    Merge branch 'master' into f20

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