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

[Rex Dieter]

commit 87fb82f694be5466f736f499cae0ad37dd6220b4
Merge: a25b5c2 8a52461
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:22:57 2015 -0600

    Merge branch 'master' into f20

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