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

[Rex Dieter]

commit 1020d6f6b31ce94a47ac89fef260bf6d20e29431
Merge: e93f092 b91d44a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 19:55:18 2014 -0500

    Merge branch 'master' into f20

 .gitignore        |   10 ++--------
 kde-baseapps.spec |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
 sources           |    2 +-
 3 files changed, 47 insertions(+), 14 deletions(-)
---