From: Aurélien Gâteau <agateau@kde.org>
Date: Thu, 21 Mar 2013 13:12:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/6dfcd7afd9336ee73d78f703e208088aa3f5ca60

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

@emmanuel: this merge includes your fix from
https://git.reviewboard.kde.org/r/109488/ . I assume this is not a
problem.

CCMAIL: emmanuelpescosta099@gmail.com
---

6dfcd7afd9336ee73d78f703e208088aa3f5ca60