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

[Rex Dieter]

commit d283391d73a8b75f5e41ffadca8b58a76a81cde7
Merge: 2dbc22c ad5b89f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:17:14 2014 -0500

    Merge branch 'master' into f20

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