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

[Rex Dieter]

commit e7453dda96559aafbac93bd80d98b3a16e3f5f77
Merge: 80ced0d 3b96d17
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Jan 18 15:21:17 2015 -0600

    Merge branch 'master' into f20

 kde-workspace.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---