commit fdcfe7c775de29c7ef2b5b563c032bfd1dac274d Merge: 6e1b311 02fa7d0 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:24:01 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kde-wallpapers.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---