commit 7b1bd6cb13cb5d4e8886ac235e9c2700cdbfbe8f Merge: 8b4f255 af19ce4 Author: Than Ngo <than at redhat.com> Date: Thu Dec 6 15:28:50 2012 +0100 Merge branch 'f18' into f17 .gitignore | 1 + kde-wallpapers.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---