From: Luca Beltrame Date: Sun, 21 Sep 2014 12:36:15 +0000 (+0200) Subject: Merge branch 'master' into frameworks X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2744fb4a0b70cdff98c4f7e857247828cffe791e?ds=inline Merge branch 'master' into frameworks --- 2744fb4a0b70cdff98c4f7e857247828cffe791e