Git commit a2d382a94af2b8f78105e107543f30954662e80b by Albert Astals Cid.
Committed on 31/03/2014 at 23:39.
Pushed by aacid into branch 'master'.

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

Conflicts:
	baloo/nepomukbaloomigrator.desktop


http://commits.kde.org/nepomuk-core/a2d382a94af2b8f78105e107543f30954662e80b