Merge branch 'MDL-35358_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 03:17:00 +0000 (11:17 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 03:17:00 +0000 (11:17 +0800)

Trivial merge