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

[Rex Dieter]

commit 058e542a9451a098890087099be501f4458f63ef
Merge: 7284753 e26d6c3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 1 09:09:56 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 kuser.spec |   28 ++++++++++++++++++++++++++--
 sources    |    2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)
---