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

[Rex Dieter]

commit bab7bd2fa780b6492168423429b65ecf6465fceb
Merge: 5cb5623 2a06de4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 16:56:16 2015 -0600

    Merge branch 'master' into f20

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