From: Luca Beltrame <lbeltrame@kde.org>
Date: Sun, 3 Aug 2014 16:49:43 +0000 (+0200)
Subject: Merge branch 'master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/df871967c948de1aeb4d635fafd937369121aef0

Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/panels/places/placesitemmodel.cpp
	kdepasswd/kcm/CMakeLists.txt [deleted in frameworks]
	kdepasswd/kcm/main.cpp [deleted in frameworks]
---

df871967c948de1aeb4d635fafd937369121aef0