From: Harald Sitter <sitter@kde.org>
Date: Fri, 21 Aug 2015 10:12:54 +0000 (+0200)
Subject: Merge branch 'Applications/15.08'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/dc7b83169d4ed55d402de71b38b6cd8d1e2fda8d

Merge branch 'Applications/15.08'

Conflicts:
	CMakeLists.txt
---

dc7b83169d4ed55d402de71b38b6cd8d1e2fda8d