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

[Rex Dieter]

commit d0aa0adaa93f56a5ef16211b2e14f06188fcbf64
Merge: d70c0f5 6b63a43
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:48:32 2014 -0500

    Merge branch 'master' into f20

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