[SCM] klines packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-7-g1364889

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 13648893e6f07344386b09774298ec0f9a6b369c
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 19:46:39 2015 -0700

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

diff --git a/debian/changelog b/debian/changelog
index 00d4ae9..9f7d689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+klines (4:14.12.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * manual merge 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 19:46:21 -0700
+
 klines (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
   * New upstream release

-- 
klines packaging