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

[Rex Dieter]

commit 83fa8f184c19485bd98ede7c436a3b116cc6e97a
Merge: ccc84eb 08fe6ff
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:24:57 2014 -0600

    Merge branch 'master' into f20

 .gitignore |    1 +
 ktux.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---