From: Luca Beltrame Date: Mon, 21 Jul 2014 19:20:05 +0000 (+0200) Subject: Merge branch 'master' into frameworks X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2b75a555caa81a992a289a13119dca5cce79d4cc?hp=-c Merge branch 'master' into frameworks --- 2b75a555caa81a992a289a13119dca5cce79d4cc