From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Sun, 25 May 2014 12:43:18 +0000 (+0200)
Subject: Merge branch 'master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/fa36c3fd1f53a223f43bb57d7c28e431a889a7c2

Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/statusbar/statusbarspaceinfo.cpp
---

fa36c3fd1f53a223f43bb57d7c28e431a889a7c2