From: Luca Beltrame Date: Wed, 16 Jul 2014 08:13:57 +0000 (+0200) Subject: Merge branch 'master' into frameworks X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e242d9548d11d92568a648efece5ff6c280b36cd?hp=--cc Merge branch 'master' into frameworks Conflicts: kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch] plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch] --- e242d9548d11d92568a648efece5ff6c280b36cd