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

[Rex Dieter]

commit f2b52af3132da671cd7a0e8c36afa1d2f9be523c
Merge: f029f3b 3a7855a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:06:23 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    3 +++
 kcalc.spec |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---