From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Thu, 14 Aug 2014 16:28:51 +0000 (+0200)
Subject: Merge branch 'KDE/4.14'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4b758c386fb3957160af334230bacd96ed810d2c

Merge branch 'KDE/4.14'

Conflicts:
	dolphin/src/dolphin.appdata.xml
---

4b758c386fb3957160af334230bacd96ed810d2c