[SCM] kbruch packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-6-gb396a87

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit b396a872776ed227a3f8dd2a7e8f8027327234da
Merge: f8e524b2cb1157f5cef62817179b5b23849e1619 4359bdaa89c9d768d2bc7b90e65195302e24f0ae
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 19:25:16 2015 -0700

    Merge branch 'kubuntu_vivid_archive' of ssh://git.debian.org:/git/pkg-kde/kde-applications/kbruch into kubuntu_vivid_archive
    manual merge

 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/changelog
index c209e80,ab5342c..432e47b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,10 @@@
  kbruch (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
 +  * Release to vivid
 +  * manual merge unstable
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 09 Mar 2015 10:17:13 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:02:44 -0700
  
  kbruch (4:14.12.2-1) experimental; urgency=medium
  

-- 
kbruch packaging