[SCM] kio packaging branch, kubuntu_unstable, updated. 517401f9804ac3ba104a1d9ad607d83866a9a8eb

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 517401f9804ac3ba104a1d9ad607d83866a9a8eb
Merge: 274a884f51393a0316c8fd9c541e854d45a62a59 be77a0b4d9dafad99f8df036026f4d29ded3a74d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Apr 2 17:26:07 2015 +0200

    merge archive

 debian/changelog                               |  6 ++++++
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 12 ++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 19 insertions(+)

diff --cc debian/patches/series
index 0000000,5a3e920..4729980
mode 000000,100644..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,0 -1,2 +1,1 @@@
 -upstream-almost_kurlcomboslash.patch
+ kubuntu_kdelibs4-docs-path.diff

-- 
kio packaging