Merge branch 'MDL-36015_23' of git://git.catalyst.net.nz/moodle-r2 into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 02:19:26 +0000 (10:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 02:19:26 +0000 (10:19 +0800)

Trivial merge