From: Christoph Feck <christoph@maxiom.de>
Date: Mon, 21 Jul 2014 19:12:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.14'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/0f2f9fd5b8d105dea3da5b493358388fd883cb30?hp=-c

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

0f2f9fd5b8d105dea3da5b493358388fd883cb30