[SCM] sonnet packaging branch, master, updated. debian/5.37.0-2-100-g6ea1571

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit aae22042aa761a425a568d205c687a4518aaeff9
Merge: 257a0bb9fb04603680e5ee39790cbf196f06ac6f a967b812a1a99b024bcd5f19e214e548419107d8
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 14:14:08 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 8b36d96,1b26c48..cdc4267
--- a/debian/changelog
+++ b/debian/changelog
@@@ -7,10 -7,7 +7,10 @@@ sonnet (5.12.0-0ubuntu1) wily; urgency=
    * Update symbols files:
      - Add new symbols; this doesn't break compilation on gcc 5 nor gcc 4.
  
 +  [ Scarlett Clark ]
 +  * Vivid backports. 
 +
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:32:46 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 16:12:48 +0200
  
  sonnet (5.11.0-1) unstable; urgency=medium
  

-- 
sonnet packaging