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

[Rex Dieter]

commit 5805d2fb44b5109da62f517a41780f25465f538a
Merge: 4f1e4f1 2daac45
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:31:30 2014 -0500

    Merge branch 'master' into f20

 .gitignore            |    1 +
 kdeplasma-addons.spec |   14 ++++++++++++--
 sources               |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---