Merge branch 'MDL-35252_M23' of git://github.com/raymondAntonio/moodle into MOODLE_23...
authorDan Poltawski <dan@moodle.com>
Tue, 25 Sep 2012 05:14:45 +0000 (13:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Sep 2012 05:14:45 +0000 (13:14 +0800)

Trivial merge