[kalzium/f17: 12/12] Merge branch 'f18' into f17

[Rex Dieter]

commit 1e2d8b25a93fe436342b38e102e71a2467224105
Merge: bc9e9a6 a13e99b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 08:57:28 2013 -0600

    Merge branch 'f18' into f17

 .gitignore   |    1 +
 kalzium.spec |   41 ++++++++++++++++++++++++++++++++---------
 sources      |    2 +-
 3 files changed, 34 insertions(+), 10 deletions(-)
---