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

[Rex Dieter]

commit 4f1e4f156e1ea9e957a39be924184349221cf7d4
Merge: 548827a 30abb86
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:53:08 2014 -0500

    Merge branch 'master' into f20

 .gitignore            |    6 ++++++
 kdeplasma-addons.spec |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 sources               |    2 +-
 3 files changed, 53 insertions(+), 4 deletions(-)
---