Merge branch 'MDL-35665' of git://github.com/raymondAntonio/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 2 Oct 2012 03:45:32 +0000 (11:45 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Oct 2012 03:45:32 +0000 (11:45 +0800)

Trivial merge