[SCM] kwin packaging branch, kubuntu_stable, updated. debian/5.4.2-1-136-g7551429

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_stable branch:
commit 75514291f812fc21cde5983795d53a24e5bf37f4
Merge: 668cbe00dfd7db4ba3e0029a200c08dc3d5c9350 90df9ea57e7ddea9e0a2a234a7b16c79048e7488
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Jan 12 12:14:36 2016 -0800

    Merge remote-tracking branch 'origin/kubuntu_xenial_archive' into kubuntu_stable

 debian/changelog |  1 +
 debian/control   | 44 ++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --cc debian/changelog
index bb56e61,6b2a66a..0dc1c44
--- a/debian/changelog
+++ b/debian/changelog
@@@ -12,14 -8,9 +12,15 @@@ kwin (4:5.5.2-0ubuntu1) UNRELEASED; urg
    * new upstream release
    * Removed Add_workaround_for_broken_no-XRandr_in_screen_edge_test.patch
    * Added missing kwin_scripts.mo files to kwin-data.install
 -  * New upstream release
  
 - -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 17:57:27 +0000
 +  [ Bhushan Shah ]
 +  * Build libkwinglutils7 on any architecture, unbreaks build on armhf
 +
 +  [ Scarlett Clark ]
 +  * Merging unstable in a desperate attempt to fix merger. 
++  * Fix merge. 
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:46:44 +0000
  
  kwin (4:5.4.3-0ubuntu4) xenial; urgency=medium
  

-- 
kwin packaging