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

[Rex Dieter]

commit bc65136998ce9bb884c1c91643b1107b01300157
Merge: 130a98a bdc48c8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:28:27 2014 -0500

    Merge branch 'master' into f20

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