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

[Rex Dieter]

commit 92f7ff76476123b883cc94b6f73caedfb4922e43
Merge: be54a6d 8fa2537
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:37:16 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    3 +++
 kuser.spec |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---