[SCM] ktp-common-internals packaging branch, kubuntu_vivid_backports, updated. ubuntu/4%15.08.2-0ubuntu1-2-gdc82f30

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=dc82f30

The following commit has been merged in the kubuntu_vivid_backports branch:
commit dc82f30c12dbe1a9ece8fa59c0a9c76c5905c593
Merge: 17e9cfaef2a94fe187227c17fa2bb90ea4bb78c8 490d0102e1800cc7cafb3320d025c94e2c1b2083
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Oct 16 17:14:50 2015 -0700

    New upstream release
    -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:50:12 +0100

 debian/changelog | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index c30a08e,6fb1442..a7e35fc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- ktp-common-internals (4:15.08.1-0ubuntu1) UNRELEASED; urgency=medium
++ktp-common-internals (4:15.08.2-0ubuntu2) UNRELEASED; urgency=medium
 +
-   * Vivid backport
++  * Fix merge. 
 +
-  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 01 Oct 2015 12:22:19 -0700
++ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 16 Oct 2015 17:14:37 -0700
++
+ ktp-common-internals (4:15.08.2-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:50:12 +0100
  
  ktp-common-internals (4:15.08.1-0ubuntu1) wily; urgency=medium
  

-- 
ktp-common-internals packaging