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

[Rex Dieter]

commit 40c45672fcba1a1408ca766d10d42b822f647ebc
Merge: 120ccca 9a8ded2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 06:46:41 2012 -0600

    Merge branch 'f18' into f17

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