From: Marco Martin <notmart@gmail.com>
Date: Fri, 3 Feb 2012 14:26:27 +0000 (+0100)
Subject: Merge branch 'KDE/4.8'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/17af97df2487a46a8b35804b7bf70b46c67ecf80

Merge branch 'KDE/4.8'

Conflicts:
	konqueror/settings/kio/proxy.desktop
---

17af97df2487a46a8b35804b7bf70b46c67ecf80