Merge branch 'MDL-37375_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:44:07 +0000 (12:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:44:07 +0000 (12:44 +0800)

Trivial merge