[SCM] kimageformats packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-7-ge63ce12

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 5b52528ad3d773a04b61cb2f75e82253a654bd5b
Merge: ca58e2b10f149279a56e145a041961281398f2bf 8f27667de77171f7864a5f772ab0f3b97f47bcce
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:00:40 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index af1174f,e10984c..6dab4fa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kimageformats (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 15:52:45 +0200
+ 
 +kimageformats (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:38:48 +0200
 +
  kimageformats (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kimageformats packaging