From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Thu, 11 Sep 2014 08:50:56 +0000 (+0200)
Subject: Merge branch 'master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/32b51b7b92e16cfaf1121cbe80ca267fc8bb0718

Merge branch 'master' into frameworks
---

32b51b7b92e16cfaf1121cbe80ca267fc8bb0718