[SCM] plasma-nm packaging branch, kubuntu_stable, updated. ubuntu/4%5.4.3-0ubuntu1-33-g466112c

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-nm.git;a=commitdiff;h=466112c

The following commit has been merged in the kubuntu_stable branch:
commit 466112ca65159e198bcc66eb55d44fc82b123438
Merge: e588c5e36e084531828be53cefbc00b3a1d357bd 2b88101e86bcf472412dd646abc06f720c8260d8
Author: Clive Johnston <clivejo at aol.com>
Date:   Wed Feb 17 16:55:04 2016 +0000

    Fixing merge conflicts

 debian/changelog | 11 +++++++----
 debian/control   | 40 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --cc debian/changelog
index 492d651,afc0742..a7ce1c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -12,13 -12,13 +12,16 @@@ plasma-nm (4:5.5.4-0ubuntu1) UNRELEASED
    * Make plasma-nm recommend libkf5wallet-bin as wifi password storage is not
      working unless kwallet is installed (and enabled).
  
-   [ Scarlett Clark ]
-   * Debian merge, No remaining changes. 
+   [ Philip Muškovac ]
+   * Merge with debian git master 
  
 +  [ Bhushan Shah ]
 +  * Alternate depend on libnm-glib-dev for vivid mobile builds
 +
-  -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 18:01:13 +0000
+   [ Clive Johnston ]
+   * New upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:17:32 +0000
  
  plasma-nm (4:5.4.3-1) unstable; urgency=medium
  

-- 
plasma-nm packaging