Merge branch 'MDL-35357_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 03:48:26 +0000 (11:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 03:48:26 +0000 (11:48 +0800)

Trivial merge