[kde-wallpapers/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit f43c65bba5a8aa4b920317bd1d01c31fcc4cf0fe
Merge: 7b1bd6c 59d8945
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:47:34 2012 -0600

    Merge branch 'f18' into f17

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