commit d2407df74cc81d1226d9fd5f7333107853634b8b Merge: baa7b20 6daf3f2 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:15:27 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kcolorchooser.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---