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

[Rex Dieter]

commit 644c2b78db591ef56a3010f1862c1efc64ad40ed
Merge: 7bd2ce0 806b397
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:12:27 2014 -0500

    Merge branch 'master' into f20

 kdenetwork.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---