[libkdegames/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 628514c36ab7c4d1b8907167f58c86bbac6f292f
Merge: 0465ac5 59839f2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 22:54:11 2014 -0500

    Merge branch 'master' into f20

 .gitignore       |    1 +
 libkdegames.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---