[SCM] libksysguard packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.2-0ubuntu1-7-gaad35ee

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit aad35ee12e159a43053db0af2dd4900a1fbef680
Merge: 9c8eefedd3c767b5c493fc70e629cd24382a433d e8f84dfd412843977d3f0af30f3ab44d9584b11a
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Oct 5 18:52:24 2015 +0000

    Merging kubuntu_stable into kubuntu_unstable.

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

diff --cc debian/changelog
index 3ad6ebc,29346b2..6dd7963
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
 +libksysguard (4:5.5.80-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * Multi-arch the package
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 17 Sep 2015 12:09:51 +0100
 +
+ libksysguard (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 11:49:42 -0700
+ 
  libksysguard (4:5.4.2-0ubuntu1) wily; urgency=medium
  
    * New upstream release

-- 
libksysguard packaging