[ktouch/f20: 11/11] Merge branch 'master' into f20

[Rex Dieter]

commit 51f46d983999e1a1d1369ba234353bc65cd5dbfe
Merge: 40ca7be 988db70
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:17:36 2014 -0500

    Merge branch 'master' into f20

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