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

[Rex Dieter]

commit 6f9bc349f785a1b3d37be2fa009c2b05906fbf8f
Merge: b5af3cc b5ac44d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:02:33 2014 -0600

    Merge branch 'master' into f20

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