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

[Jan Grulich]

commit e51a7bc15857ca97773a09320d2124554cc7f448
Merge: d25f571 a4448c4
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Thu May 22 18:57:38 2014 +0200

    Merge branch master

 .gitignore                     |    1 +
 kde-plasma-nm.spec             |   26 +++++-----
 plasma-nm-bluetooth-icon.patch |   16 ------
 plasma-nm-item-text.patch      |   27 -----------
 plasma-nm-openconnect.patch    |  101 ----------------------------------------
 sources                        |    2 +-
 6 files changed, 15 insertions(+), 158 deletions(-)
---