[kuser/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit b5ea8c6ee58a5e2ade2bcf95d97f6e85d61bf786
Merge: 522470b 9aa8ff5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:44:32 2015 -0600

    Merge branch 'master' into f20

 .gitignore |   23 +----------------------
 kuser.spec |   27 +++++++++++++++++++--------
 sources    |    2 +-
 3 files changed, 21 insertions(+), 31 deletions(-)
---