Git commit 6babadf389f08fc824d50743bb6d12701d0abc1a by Albert Astals Cid.
Committed on 31/03/2014 at 23:38.
Pushed by aacid into branch 'KDE/4.13'.

Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13

Conflicts:
	services/fileindexer/indexer/nepomukofficeextractor.desktop


http://commits.kde.org/nepomuk-core/6babadf389f08fc824d50743bb6d12701d0abc1a