[SCM] kshisen packaging branch, kubuntu_wily_archive, updated. debian/14.12.2-1-13-ge078248

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kshisen.git;a=commitdiff;h=e078248

The following commit has been merged in the kubuntu_wily_archive branch:
commit e0782484b6545626466fd32b60efb255217f2a49
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sat Jun 6 01:52:34 2015 +0200

    New upstream release
---
 debian/changelog | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9af4477..b5e61ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-kshisen (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
+kshisen (4:15.04.2-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * manual merge 
   * New upstream release
   * New upstream release
   * Vivid backport
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 08:59:59 -0700
+  [ Jonathan Riddell ]
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 06 Jun 2015 01:52:34 +0200
 
 kshisen (4:14.12.3-0ubuntu1) vivid; urgency=medium
 

-- 
kshisen packaging