[kolourpaint/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 27d87157fc630764db8e2f0c85707e088a7ad6ec
Merge: 1887140 d506f41
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:04:50 2012 -0500

    Merge branch 'f18' into f17

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