[SCM] kmediaplayer packaging branch, master, updated. debian/5.37.0-2-75-g4b1fbb2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit bff1e5acb0b5822b767e4fd4e5376a77d8b09f9c
Merge: 0f3550cdefc4ba0e83d580cba4cc023f81d7e0e8 aba26e35c369dd068f388ff1426348ccf8ea1732
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 12:35:39 2015 +0000

    Merging remotes/origin/kubuntu_wily_archive into kubuntu_unstable.

 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 6325fe5,0cd6770..aba0f1d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,9 -2,8 +2,9 @@@ kmediaplayer (5.12.0-0ubuntu1) wily; ur
  
    * New upstream release
    * Fix merge.
 +  * Vivid backport. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:17:20 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:34:10 +0200
  
  kmediaplayer (5.11.0-1) unstable; urgency=medium
  

-- 
kmediaplayer packaging