commit 2403a559f4163b25fb35387d0e833a0622310450 Merge: cef371a 827aafe Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 23:08:17 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ kolourpaint.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---