[kdeadmin/f20: 9/9] Merge branch 'master' into f20

[Rex Dieter]

commit d33e8f0649e42583d90d9c2e34b7c62be2d207e0
Merge: e7ebd07 4bf6623
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:45:52 2014 -0600

    Merge branch 'master' into f20

 kdeadmin.spec |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
---