[kde-workspace/f20: 2/2] Merge branch 'f21' into f20

[Kevin Kofler]

commit 851322ffd2cb406828a7194663d18d2dfad55b8d
Merge: d791d55 8c0357f
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 7 02:59:59 2015 +0100

    Merge branch 'f21' into f20

 kde-workspace-4.11.16-colorschemes-kde4.patch | 33 +++++++++++++++++++++++++++
 kde-workspace.spec                            | 13 +++++++----
 2 files changed, 41 insertions(+), 5 deletions(-)
---