From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sat, 11 May 2013 16:47:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/cad78cdfcf1f3b76acaadc7e9394df3ef466d770

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

Conflicts:
	CMakeLists.txt
---

cad78cdfcf1f3b76acaadc7e9394df3ef466d770