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

[Rex Dieter]

commit 4fa071716a6fdefc5ae3b84dc12030c20c35978b
Merge: 0f20c8a 051999d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:51:28 2014 -0500

    Merge branch 'master' into f20

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