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

[Rex Dieter]

commit 9b0e9f300d33c5039cd6fae68e3baee5acc755d9
Merge: 7e63bc5 a589231
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 16:12:18 2014 -0600

    Merge branch 'master' into f20

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