[kdeplasma-addons/f17: 18/18] Merge branch 'f18' into f17

[Rex Dieter]

commit 1984a2614dd80295959fe64930f52fed52088cd6
Merge: e1e3bf7 f5fa5df
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 09:17:12 2013 -0600

    Merge branch 'f18' into f17

 .gitignore            |    7 +---
 kdeplasma-addons.spec |   98 ++++++++++++++++++++++++------------------------
 sources               |    2 +-
 3 files changed, 51 insertions(+), 56 deletions(-)
---