[SCM] plasma-nm packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-8-g7da9f12

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 5f10c53149243dc4650748b51289c0ef7b00ca5b
Merge: 394d1b9bd5bfee9ac259c858b407d333d0edbeff 78367e4211556d5195c510691f19d305d2260870
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 18 09:18:01 2015 -0800

     * Fix merge.  * Fix another merge.
    
     * Fix merge.
     * Fix another merge.

 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --cc debian/changelog
index 921595d,4e76808..a7461f8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,15 +1,28 @@@
 -plasma-nm (4:5.4.3-0ubuntu1) UNRELEASED; urgency=medium
++plasma-nm (4:5.5.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
++  * New upstream release Xenial
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 18 Dec 2015 09:17:56 -0800
++
 +plasma-nm (4:5.4.3-0ubuntu1) xenial; urgency=medium
 +
 +  [ Scarlett Clark ]
    * Remove upstream applied:
      upstream_fix_making_bluez_asynchronous.diff 
    * Git remove series file. 
    * New upstream bugfix release
+   * Fix merge. 
    * Remove patch from git.
    * Remove series file.. 
++<<<<<<<
 +
++=======
+   * Fix another merge.
++>>>>>>>
 +  [ Philip Muškovac ]
 +  * New upstream bugfix release (LP: #1518598)
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 09 Nov 2015 18:40:56 -0800
 + -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:43:42 +0100
  
  plasma-nm (4:5.4.2-0ubuntu2) xenial; urgency=medium
  

-- 
plasma-nm packaging