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

[Rex Dieter]

commit 7a64018ca733f91854b06edf35b2b23727a3eccd
Merge: ba7fe32 2065f2b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 19:37:23 2015 -0600

    Merge branch 'master' into f20

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