Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:26:32 +0000 (10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:26:32 +0000 (10:26 +0800)

Trivial merge