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

[Rex Dieter]

commit be4c0b619839e2119c4f4891c8ac9f15a988ad5d
Merge: 0915230 f6b465d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:34:53 2014 -0600

    Merge branch 'master' into f20

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