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

[Rex Dieter]

commit e1e3bf73f18da0d72907e2874009f703467f601f
Merge: 7f38c44 dcee82e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:46:14 2012 -0600

    Merge branch 'f18' into f17

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