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)

Trivial merge