[SCM] ki18n packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-14-g0b21fef

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit d5b390e842bb5b3ea244b07e33877d4fe4c3aa88
Merge: ee55239aeb0cf1b9c53aa65f30a8754ab2063a78 91f0ce214b6cc83ddb9bdf0d5c86e72f279b3115
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 11:00:41 2015 -0700

    Merge branch 'kubuntu_unstable' of ssh://git.debian.org:/git/pkg-kde/frameworks/ki18n into kubuntu_unstable
    
    Conflicts:
    	debian/changelog

-- 
ki18n packaging