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

[Rex Dieter]

commit c95b4e772b67d7a7817233d0145ecc42b24f6152
Merge: 9eda99c 4a339a5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:46:01 2014 -0500

    Merge branch 'master' into f20

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