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

[Rex Dieter]

commit be54a6d3d73ee56d9eda3df7c6933a8e0b4d89b1
Merge: 058e542 6c2a389
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:49:00 2014 -0500

    Merge branch 'master' into f20

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