From: Frank Reininghaus Date: Thu, 5 Jun 2014 06:57:31 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into frameworks X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c12dc996f535f787ab828560068a2c8b7f98c5cf Merge remote-tracking branch 'origin/master' into frameworks --- c12dc996f535f787ab828560068a2c8b7f98c5cf