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

[Rex Dieter]

commit d34efccccec54ae46df867f75c42e77f0fe9c283
Merge: 69d6668 4fc0cca
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:11:20 2015 -0600

    Merge branch 'master' into f20

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