[SCM] frameworkintegration packaging branch, master, updated. debian/5.37.0-2-105-ge9c37f4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e8ea53acb9d951cb6b95f4d6d4c995b012fe0d8f
Merge: 6e22e6bb8696d5f66a15f2f93fa6afe43c0495e3 58b4b6a05b310a2605a05f7a6d6aff7cde3a6e52
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 12:24:07 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 0f7805a,a50859d..283b5cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,11 -2,8 +2,11 @@@ frameworkintegration (5.12.0-0ubuntu1) 
  
    * New upstream release
    * Fix merge, remove broken backport.
 +  * Vivid backport. 
 +  * Apply 0001-Fix-changelog-format-to-avoid-a-lintian-warning.patch
 +    provided by santa. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:53:54 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:23:00 +0200
  
  frameworkintegration (5.11.0-1) unstable; urgency=medium
  

-- 
frameworkintegration packaging