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

[Rex Dieter]

commit 1c1de0fcd29c5009ac5fc190e46b01fe6d19b5d6
Merge: 7a64018 8bdc244
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:12:07 2015 -0600

    Merge branch 'master' into f20

 .gitignore         | 2 ++
 kde-dev-utils.spec | 8 +++++++-
 sources            | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---