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

[Rex Dieter]

commit 299e9c8e1930b020831d84334d82f108ef15df0a
Merge: 509387c 3e0922e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:00:42 2012 -0500

    Merge branch 'f18' into f17

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