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

[Rex Dieter]

commit 94357d96e7dba8469678e4325be735379758d473
Merge: 8323287 c647f72
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:45:15 2014 -0500

    Merge branch 'master' into f20

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