Merge branch 'MDL-21801_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 02:30:00 +0000 (10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 02:30:00 +0000 (10:30 +0800)

Trivial merge