From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sun, 29 Dec 2013 08:50:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/KDE/4.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4ddc3cfdde7a52f5880928f7cc8ee8896ded686d?hp=--cc

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

4ddc3cfdde7a52f5880928f7cc8ee8896ded686d