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

[Rex Dieter]

commit 5cb56236ed012e35632e3ad571adf210ca396b93
Merge: 925c4a0 a1120f1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:57:46 2014 -0600

    Merge branch 'master' into f20

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