commit 0f4a5697d549b18c06cd148a6e7adef06a1f5cf8 Merge: c0dc639 393ac3d Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:47:18 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ ktouch.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---