From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sun, 1 Jun 2014 12:52:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/59d01e8accbfb7f31fb5ea5ef4c94e57d427994a

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	lib/konq/konq_operations.cpp
---

59d01e8accbfb7f31fb5ea5ef4c94e57d427994a