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

[Rex Dieter]

commit d06fac995e6091fbabd500fe0c6f2612dc0daa76
Merge: 03b0ece 4648c84
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:44:52 2014 -0500

    Merge branch 'master' into f20

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