[kde-baseapps/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 6433c53a9ce2fa0c5ee8fa8ce6a16688b11e8b61
Merge: 1020d6f bef7676
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 08:35:26 2014 -0500

    Merge branch 'master' into f20

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