[SCM] kwin packaging branch, kubuntu_stable, updated. debian/5.4.2-1-134-g668cbe0

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_stable branch:
commit 668cbe00dfd7db4ba3e0029a200c08dc3d5c9350
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Jan 12 12:09:32 2016 -0800

    Merging unstable in a desperate attempt to fix merger.
---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b90d7dc..bb56e61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ kwin (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
   [ Bhushan Shah ]
   * Build libkwinglutils7 on any architecture, unbreaks build on armhf
 
+  [ Scarlett Clark ]
+  * Merging unstable in a desperate attempt to fix merger. 
+
  -- 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