Merge branch 'MDL-35740-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 18 Dec 2012 00:45:48 +0000 (08:45 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Dec 2012 00:45:48 +0000 (08:45 +0800)

Trivial merge