[SCM] libksysguard packaging branch, master, updated. cf05206d4784eba027073c51323699e2c5fb75da

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 54464d58fe517e3f0694ce6419617211cca9cc0e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jun 30 22:28:30 2015 +0200

    Fix changelog after merge.
---
 debian/changelog | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c61ac29..37331e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,6 @@ libksysguard (4:5.3.2-1~) UNRELEASED; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:26:37 +0200
 
-libksysguard (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:30:37 +0200
-
 libksysguard (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Jonathan Riddell ]
@@ -19,7 +13,7 @@ libksysguard (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
   * Vivid backport
-  * wrap-and-sort 
+  * wrap-and-sort
 
   [ Jonathan Riddell ]
   * New upstream release

-- 
libksysguard packaging