[SCM] kshisen packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-7-g2da315a

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 2da315a01a45eba52f350ebe0704c734e12b2b8d
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 20:12:21 2015 -0700

    manual merge
---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6f3ff41..556edbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kshisen (4:14.12.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * manual merge 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 20:11:27 -0700
+
 kshisen (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
   * New upstream release

-- 
kshisen packaging