[SCM] kfourinline packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-6-g47ead71

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 47ead71090da6e4911419f68e17a69a4545cd652
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 19:40:31 2015 -0700

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

diff --git a/debian/changelog b/debian/changelog
index 3ec57eb..09da0d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kfourinline (4:14.12.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * manual merge kubuntu_stable.
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 19:39:06 -0700
+
 kfourinline (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
   * New upstream release

-- 
kfourinline packaging