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

[Rex Dieter]

commit 7043aee7638123280d481ca04da3994751cc5cc4
Merge: 79555de 8894274
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 09:21:59 2015 -0600

    Merge branch 'master' into f20

 .gitignore      |    1 +
 kmousetool.spec |    9 ++++++---
 sources         |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---