commit 49c7a1944e711f0e6f9b4dff357243466488f0a2 Merge: 9986368 e4c9439 Author: Rex Dieter <rdieter at math.unl.edu> Date: Sat Oct 11 21:58:21 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 + kde-dev-scripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---