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

[Rex Dieter]

commit b5794534e82b9bb253fd76e0af7a76110f1f8438
Merge: 0773f21 a219397
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Feb 7 04:10:45 2015 -0600

    Merge branch 'master' into f21

 kde-workspace-kdm_local_ipv6.patch |   45 ++++++++++++++++++++++++++++++++++++
 kde-workspace.spec                 |   21 +++++++++++-----
 2 files changed, 59 insertions(+), 7 deletions(-)
---