[kde-workspace/f21: 5/5] Merge branch 'master' into f21

[Rex Dieter]

commit 9b28369c9b834e1b4c52d87d44d4724480abbff0
Merge: 52e9b28 69c7c40
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Jan 18 13:44:24 2015 -0600

    Merge branch 'master' into f21

 .gitignore         |    2 +-
 kde-workspace.spec |  146 ++++++++++++++++++++++++++++++++++++++++++++-------
 sources            |    2 +-
 3 files changed, 128 insertions(+), 22 deletions(-)
---