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

[Rex Dieter]

commit 130a98af1a5a91224144c70160b2722d9860a52e
Merge: e3b39b3 2f6b62a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:48:42 2014 -0500

    Merge branch 'master' into f20

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