From: Luca Beltrame <luca.beltrame@marionegri.it>
Date: Wed, 27 Mar 2013 15:50:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/8cc479518be479365d91e5139f064fcce970d0a3

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

Conflicts:
	plasma/applets/folderview/folderview.cpp
---

8cc479518be479365d91e5139f064fcce970d0a3