From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Thu, 26 Feb 2015 13:38:55 +0000 (+0100)
Subject: Merge branch 'master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2b895e7e2bd096e55faa1032ebc6a355a72c2325?hp=-c

Merge branch 'master' into frameworks
---

2b895e7e2bd096e55faa1032ebc6a355a72c2325