commit cf6e56180191e656ac87829845a908bbd27dcb8d Merge: dfdba89 a1b1822 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jul 15 12:43:25 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 + kremotecontrol.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---