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

[Rex Dieter]

commit 8e01debd11083d28caab36fd0eab4fdd23ed6a14
Merge: 5e6adeb 00ffd2f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:45:37 2014 -0500

    Merge branch 'master' into f20

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