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

[Rex Dieter]

commit 5b6fd1f66a5c724ae87489a6728d093267dfdb02
Merge: c82c741 54b3b0e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:25:01 2014 -0500

    Merge branch 'master' into f20

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