From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Sun, 31 Aug 2014 15:09:29 +0000 (+0200)
Subject: Merge branch 'KDE/4.14'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/773028f270e4820776e1bedccb91a56cd5ec6078

Merge branch 'KDE/4.14'

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

773028f270e4820776e1bedccb91a56cd5ec6078