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

[Rex Dieter]

commit a4775859b76e33390871cc5e8d61aa1ed4c2f3bd
Merge: bab7bd2 7900da5
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:11:30 2015 -0600

    Merge branch 'master' into f20

 .gitignore         | 2 ++
 kcolorchooser.spec | 8 +++++++-
 sources            | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---