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

[Rex Dieter]

commit aa9ccb064c54ff058144b77181630dfeb364d0eb
Merge: 8e01deb 80ad905
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:26:25 2014 -0500

    Merge branch 'master' into f20

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