[kdegames/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 1fe70ddf0058dbb63e3f4c2dbd352d2b4288ff41
Merge: 0090f6f 8d8def7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:49:34 2014 -0500

    Merge branch 'master' into f20

 kdegames.spec |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---