[SCM] ki18n packaging branch, master, updated. debian/5.11.0-1-6-gcd9b2a4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7e168483bc1ea8b24b2410935dbcdf78dcc2073c
Merge: 61e54fc3484bea872cecb71450e775a7037c2a69 0fc4a26be2bdc63f5e6ed5a6bf675bfcb0a75e2f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jul 7 19:14:09 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_wily_archive'

 debian/changelog | 10 ++++++++++
 debian/control   |  2 +-
 debian/copyright |  7 ++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 114069f,917e34d..bf698e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,13 +1,26 @@@
 +ki18n (5.12.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.12.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 07 Jul 2015 17:35:37 +0200
 +
 +ki18n (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 10:48:38 +0200
 +
+ ki18n (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:43:01 +0200
+ 
  ki18n (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
ki18n packaging