[SCM] kfilemetadata packaging branch, kubuntu_unstable, updated. ede3e2c37817bcafdca99a22013ac68249a5a931

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 9af29d3f59ff5a4fe6d6b68b9f52e999c566e7c1
Merge: 3e8d97d604293f69fc2ef436311e3dedef481d11 308b47322dc0f7ef1a745d03bbc084815b41cfb0
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 28 15:09:33 2014 +0100

    Merge branch 'kubuntu_utopic_next' into kubuntu_unstable
    
    Conflicts:
    	debian/libkf5filemetadata2.symbols

 debian/control                     |  3 +--
 debian/libkf5filemetadata2.symbols | 54 +++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 29 deletions(-)

-- 
kfilemetadata packaging