[kdeplasma-addons/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit a74d16f6f7f433541312447cf6fdd6b97dbde67a
Merge: 911fa2c c93eeee
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Oct 14 06:51:19 2014 -0500

    Merge branch 'master' into f20

 kdeplasma-addons.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---