Merge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:54:09 +0000 (22:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:54:09 +0000 (22:54 +0800)
commita28c6b440e5fa5604406fd6deb15c7a366138627
tree612ad8cca30e194446ab58b4cc8d289fa602030f
parent5e70fc1f9c6234b6a1edbd779e02147042c4a10a
parente2cceaffad189a6a2bdc20da42fa5c0879832424
Merge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle