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

[Rex Dieter]

commit 69d6668a2bcadc5d233ae85e045c5cd4e927e664
Merge: 1e56254 07bc1ac
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 16:55:53 2015 -0600

    Merge branch 'master' into f20

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