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

[Rex Dieter]

commit c82c741eb4659fa51e6a1056715b3b279695d01b
Merge: 9a2c9f3 276ff7d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:43:16 2014 -0500

    Merge branch 'master' into f20

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