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

[Rex Dieter]

commit dec27efc61abe87cb9d0b820ca86db17833eb411
Merge: 8c03db4 c742566
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:58:38 2014 -0600

    Merge branch 'master' into f20

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