[SCM] khotkeys packaging branch, master, updated. 71e391e0c857a4710335da879f120bbeb5b9930b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 78d55e201faf70048393446ea3d47059d2203a56
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 2 07:56:32 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 ee9d1ba..a509ad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,12 +6,6 @@ khotkeys (4:5.3.2-1~) UNRELEASED; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:25:02 +0200
 
-khotkeys (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:26:28 +0200
-
 khotkeys (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Jonathan Riddell ]
@@ -20,7 +14,7 @@ khotkeys (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
   * Vivid backport
-  * Wrap-and-sort. 
+  * Wrap-and-sort.
 
   [ Jonathan Riddell ]
   * New upstream release

-- 
khotkeys packaging