Merge branch 'MDL-35336_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 04:24:23 +0000 (12:24 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 04:24:23 +0000 (12:24 +0800)

Trivial merge