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

[Rex Dieter]

commit 00f26cf89c04d355aef95469ab80537cb8e5b949
Merge: 7a23859 5b67be2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 10:45:21 2014 -0600

    Merge branch 'master' into f20

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