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

[Rex Dieter]

commit b4d2d07970e40779bdb0ad7a7b2eb6c334192e2e
Merge: 0d89c17 b8dc3d3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:56:27 2012 -0500

    Merge branch 'f18' into f17

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