[SCM] ksysguard packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-26-g50516c2

[Clive Johnston]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 50516c265bf8ad3f315d5a9422eec7418054a315
Merge: bbf412b9333ee3ea02b4d18b0f6c660579f8fe04 8ac56f8419b776cb9dd0dc036b63c693f8e50a17
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 27 20:50:08 2016 +0000

    Fixing copyright file

 debian/changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index a58b51f,1de356f..fa39f83
--- a/debian/changelog
+++ b/debian/changelog
@@@ -8,8 -8,11 +8,14 @@@ ksysguard (4:5.5.4-0ubuntu1) UNRELEASED
    * new upstream release
    * New upstream release
    * New upstream release
-   * Fixing copyright file
+ 
+   [ Scarlett Clark ]
+   * Fix copyright file merge. 
+   * Another merge tag in copyright.
+ 
++  [ Clive Johnston ]
++  * Fixing copyright file 
 +
   -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:11:41 +0000
  
  ksysguard (4:5.4.3-0ubuntu1) xenial; urgency=medium

-- 
ksysguard packaging