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

[Rex Dieter]

commit bddf54e71ab8990dafb95854e36a14382bce2397
Merge: a07df6a 44d01f8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Feb 7 09:18:02 2015 -0600

    Merge branch 'master' into f20

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