[SCM] plasma-mediacenter packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-15-gdda257a

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit dda257ac5443ba38a3c29658633026fd4e2926e0
Merge: 4209007676565a92821db53fd4b3b716f3ab5132 f76877675522935af9296004ccf4cc74a6f37120
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 18 09:17:03 2015 -0800

     * Create backports branch.  * New upstream bugfix release
    
     * Create backports branch.
     * New upstream bugfix release

 debian/changelog | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 739cbe8,8bc9cac..7e64ce7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,7 +1,23 @@@
++plasma-mediacenter (4:5.5.1-0ubuntu1) UNRELEASED; urgency=medium
++
++  * New upstream release Xenial
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 18 Dec 2015 09:14:50 -0800
++
++<<<<<<< HEAD
 +plasma-mediacenter (4:5.4.3-0ubuntu1) xenial; urgency=medium
 +
 +  * New upstream bugfix release (LP: #1518598)
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:42:12 +0100
 +
 +plasma-mediacenter (4:5.4.2-0ubuntu1) wily; urgency=medium
++=======
+ plasma-mediacenter (4:5.4.3-0ubuntu1) UNRELEASED; urgency=medium
++>>>>>>> origin/kubuntu_stable
  
-   * New upstream release
+   * Create backports branch. 
+   * New upstream bugfix release
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 16:00:16 +0100
  

-- 
plasma-mediacenter packaging