Merge branch 'wip-MDL-37942-master' of git://github.com/jason-platts/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Apr 2013 11:42:10 +0000 (12:42 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Apr 2013 11:42:10 +0000 (12:42 +0100)

Trivial merge