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

[Rex Dieter]

commit 4a12958dbeb7be78d572160c26b1b5f4d403509e
Merge: 66b3c9c cdedf78
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:47:07 2014 -0500

    Merge branch 'master' into f20

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