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

[Rex Dieter]

commit 5707a02f36408a45f704343f72bee7cdbc840e1b
Merge: 3117950 78148ed
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:48:20 2014 -0500

    Merge branch 'master' into f20

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