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

[Rex Dieter]

commit b730f0828c00cdc58f466221d1a8c3690b23d8b1
Merge: 8f01f9d 8078d99
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:22:20 2015 -0600

    Merge branch 'master' into f20

 .gitignore  | 2 ++
 ktimer.spec | 8 +++++++-
 sources     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---