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

[Rex Dieter]

commit eded1acd8d7232cc1af8f1d0ff992db2984b3468
Merge: 2b0690b f8af736
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 16:55:32 2015 -0600

    Merge branch 'master' into f20

 .gitignore |    1 +
 kcalc.spec |    9 ++++++---
 sources    |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---