From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Fri, 27 Feb 2015 10:30:27 +0000 (+0100)
Subject: Merge branch 'frameworks'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/9aee5d22513f0367febab54b38b3a7dc58d120bb?ds=inline

Merge branch 'frameworks'
---

9aee5d22513f0367febab54b38b3a7dc58d120bb