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

[Rex Dieter]

commit 66b3c9c6263252463a427e3f8a292ff98c9ef702
Merge: 5950b8b 50fbc02
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:16:53 2014 -0500

    Merge branch 'master' into f20

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