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

[Rex Dieter]

commit 0202fff83a85e336c6ff8b4c47101a390ff8b4c6
Merge: 6dfb8cf 4f85fe3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:31:58 2012 -0600

    Merge branch 'f18' into f17

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