From: Sam Hemelryk Date: Mon, 20 Feb 2012 21:33:00 +0000 (+1300) Subject: Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict... X-Git-Tag: v2.3.0-beta~1166 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=da3ec93275f07f6d3d5ed3b457dc72596ac01c87 Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict resolution --- da3ec93275f07f6d3d5ed3b457dc72596ac01c87