commit 2d545bfd097baa0e0a8df29e95f793540d7d2485 Merge: 29113df 685147d Author: Rex Dieter <rdieter at math.unl.edu> Date: Sat Nov 8 20:00:56 2014 -0600 Merge branch 'master' into f20 kdegames.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---