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

[Rex Dieter]

commit 4b5999f114a9c0ff6f3f44a99f490979823b0b12
Merge: dc8712b 216e09c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:39:59 2014 -0600

    Merge branch 'master' into f20

 kdenetwork.spec |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
---