Merge branch 'MDL-36549_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:19:10 +0000 (14:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:19:10 +0000 (14:19 +0800)

Trivial merge