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

[Rex Dieter]

commit d70c0f5e8b82d682bac5c63e92b1918cf34f1615
Merge: 9149282 c590650
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:18:44 2014 -0500

    Merge branch 'master' into f20

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