[SCM] kio packaging branch, kubuntu_unstable, updated. d233c730dcbcc22dcabad183fa7e39d5ca9ea34a

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit d233c730dcbcc22dcabad183fa7e39d5ca9ea34a
Merge: 48522d98310cc42bce18a698d8c3d5fce3a28b13 88adf7cd5e5b4cf33b55e3ac57e937e26fe2e5b1
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 7 09:09:39 2014 +0200

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

 debian/changelog |  5 +++--
 debian/control   | 56 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

-- 
kio packaging