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

[Rex Dieter]

commit a1ff168e3fbebb2ccc479072b5e7a6e142a1401f
Merge: 5707a02 c0ea5bb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:28:13 2014 -0500

    Merge branch 'master' into f20

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