[SCM] muon packaging branch, master, updated. ef3a6ef2621e3f400f9469961fa275788c8a9897

[Maximiliano Curia]

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

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

    Fix changelog after merge.
---
 debian/changelog | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa36e9f..70ca864 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,6 @@ muon (4:5.3.2-1~) UNRELEASED; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:20:00 +0200
 
-muon (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:31:23 +0200
-
 muon (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Jonathan Riddell ]
@@ -19,7 +13,7 @@ muon (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
   * Vivid backport
-  * wrap-and-sort 
+  * wrap-and-sort
 
   [ Jonathan Riddell ]
   * New upstream release
@@ -99,7 +93,7 @@ muon (4:5.2.1git20150304-0ubuntu1) vivid; urgency=medium
 
 muon (4:5.2.1-0ubuntu1) vivid; urgency=medium
 
-  * New upstream release 
+  * New upstream release
   * Add missing .mo files
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:45:04 -0800

-- 
muon packaging