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

[Rex Dieter]

commit b3a17f7a07d8e2bd496be059685a4d8a31bc62f5
Merge: aff01a4 75ec880
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:46:48 2014 -0500

    Merge branch 'master' into f20

 kdeadmin.spec |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---