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

[Rex Dieter]

commit 6d48d7572a9d9996a4ca23f1cf3864fcf5331743
Merge: c01d609 915912e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 10:22:12 2014 -0600

    Merge branch 'master' into f20

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