[kcalc/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit f029f3b481c84617d5c3eeff2055808b35b8459d
Merge: d06fac9 c4cd375
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:25:57 2014 -0500

    Merge branch 'master' into f20

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