commit 1b1e7e4d73454d9355051aa614ba0f32595a9aac Merge: e8b13bb c719e5b Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jul 15 12:33:25 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 + kde-wallpapers.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---