[kolourpaint/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit d8f8431b495d84246a151789996239b41d79d49b
Merge: 2403a55 b2e7d9b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:41:31 2014 -0500

    Merge branch 'master' into f20

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