Merge branch 'MDL-33815_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 03:09:06 +0000 (11:09 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 03:09:06 +0000 (11:09 +0800)

Trivial merge