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

[Rex Dieter]

commit 75170fa127acb4954440723049ef2ed2c7801e96
Merge: ce5c77a f9e86de
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:39:50 2014 -0500

    Merge branch 'master' into f20

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