[SCM] kitemmodels packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-22-g3a06361

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 3a06361816bf4d5e43c7e3d0affecd1d88f06b5b
Merge: 2eb2f73e6e3b4dd706d7699981291847217a877c e96d1e8a451e3fd358ed7ac9c1e7ac1abfb8bdd9
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Jul 30 02:53:03 2015 -0700

    Vivid backports.

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

diff --cc debian/changelog
index 98f4154,118f86e..539aaa8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,7 +1,10 @@@
  kitemmodels (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
    * New upstream release
 +  * Apply 0001-Update-symbols-files.patch provided by
 +    santa. 
+   * Vivid backports. 
++  * Fix broken merge. 
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:14:28 -0700
  

-- 
kitemmodels packaging