From: Luca Beltrame <lbeltrame@kde.org>
Date: Tue, 20 Nov 2012 06:44:59 +0000 (+0100)
Subject: Merge branch 'KDE/4.9'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/59e8f22cd5de7cc1811550d8bac6aacc5c36587c

Merge branch 'KDE/4.9'

Conflicts:
	konqueror/settings/kio/kcookiespolicies.cpp [master only changes]
	konqueror/settings/kio/kcookiespolicies.h [ditto]
---

59e8f22cd5de7cc1811550d8bac6aacc5c36587c