[kolourpaint/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit 59fa60174c216c0560ad516918ca4e09935162ef
Merge: 1a1948e 49c31bc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:38:19 2013 -0500

    Merge branch 'master' into f19

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