From: Jekyll Wu <adaptee@gmail.com>
Date: Tue, 10 Jan 2012 12:09:21 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/KDE/4.8'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/1375f8316843a71552a3f67002e323d810170837

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

Conflicts:
	dolphin/src/main.cpp
---

1375f8316843a71552a3f67002e323d810170837