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

[Rex Dieter]

commit 7bd2ce04476726c25bc57ec20efbc29eefd7923e
Merge: 4fa0717 23e4bbd
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:30:14 2014 -0500

    Merge branch 'master' into f20

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