[SCM] baloo packaging branch, kubuntu_unstable, updated. f1109aae7a4f2a419f4bd1885654e5f5bad1a261

Wed May 13 07:24:55 UTC 2015

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

The following commit has been merged in the kubuntu_unstable branch:
commit f1109aae7a4f2a419f4bd1885654e5f5bad1a261
Merge: 2ba430fe747d0eb4b5bb5117e5ca8d1cb9ab2cfd b5075b1fdeb2e45a48e6910f475d0efcb9f3868a
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 13 09:24:36 2015 +0200

    Merge branch 'kubuntu_stable' into kubuntu_unstable
    
    Conflicts:
    	debian/libkf5balooxapian1.symbols

-- 
baloo packaging