commit f3a52aab10b0883efd4764903d74ae82028a3447 Merge: add6899 307d406 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:16:27 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kdeartwork.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---