[SCM] kcodecs packaging branch, master, updated. debian/5.37.0-2-93-gd165600

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcodecs.git;a=commitdiff;h=9d29382

The following commit has been merged in the master branch:
commit 9d293823e11145f1985e499eb8a7cd31336ef433
Merge: 01bd727e9b725568498186942d6d6c6e467a70a6 3c4539d7cc59a3a4eb4686d063e366e4baa69106
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jul 30 17:50:50 2015 +0200

     Merge branch 'kubuntu_wily_archive' into kubuntu_unstable

 debian/changelog |  8 ++++++--
 debian/copyright | 20 ++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index 1aad25b,014447f..3486cc4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,13 @@@
- kcodecs (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
+ kcodecs (5.12.0-0ubuntu2) UNRELEASED; urgency=medium
  
+   [ Scarlett Clark ]
    * New upstream release
 +  * Vivid backport. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:58:34 -0700
+   [ Aaron Honeycutt ]
+   * Fix debian/copyright
+ 
+  -- Aaron Honeycutt <aaronhoneycutt at kubuntu.org>  Thu, 30 Jul 2015 17:35:26 +0200
  
  kcodecs (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
  

-- 
kcodecs packaging