[SCM] khelpcenter packaging branch, kubuntu_wily_archive, updated. ubuntu/4%5.3.2-0ubuntu1-7-gf369e77

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/khelpcenter.git;a=commitdiff;h=55ba0a8

The following commit has been merged in the kubuntu_wily_archive branch:
commit 55ba0a83f3062b4e647b289e58c6804af7375b7c
Merge: 33193260f07462b5332a129d9e71d9eea1adca6c 3ee9e1ed7d0291fd449a2927ff0fe05c0068bea4
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Aug 5 03:13:40 2015 +0200

    Merge branch 'kubuntu_stable' into kubuntu_unstable
    
    Conflicts:
    	debian/khelpcenter.install

 debian/khelpcenter.install | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

-- 
khelpcenter packaging