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

[Rex Dieter]

commit d791d55ddea49fd7cd02a6acf368413f9bb008ef
Merge: 9cbcd19 7cfef29
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 6 13:20:38 2015 -0600

    Merge branch 'f21' into f20

 kde-workspace.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---