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

[Rex Dieter]

commit aebf6225250accdbaa935cb59ee43e59a43ef085
Merge: b3a17f7 b97dbc5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:27:09 2014 -0500

    Merge branch 'master' into f20

 kdeadmin.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---