From: Sam Hemelryk Date: Tue, 3 Jul 2012 21:32:45 +0000 (+1200) Subject: Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2 X-Git-Tag: v2.4.0-beta~1134 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c425663c4c97ad0523335923fc7851712f2799f8 Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2 --- c425663c4c97ad0523335923fc7851712f2799f8