[kde-plasma-nm/f20: 3/3] Merge branch 'master' into f20

[Jan Grulich]

commit 7fc60df1466d15528059f0be71969634d3c391fb
Merge: 4157f59 6cae64a
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Wed Jul 2 19:30:53 2014 +0200

    Merge branch 'master' into f20

 kde-plasma-nm.spec                 |   22 ++++++++++++++--------
 sources                            |    2 +-
 vpn-crash-plasma-nm-0.9.3.4.patch  |   19 -------------------
 wifi-crash-plasma-nm-0.9.3.4.patch |   17 -----------------
 4 files changed, 15 insertions(+), 45 deletions(-)
---