Merge branch 'MDL-36806_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:26:46 +0000 (13:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:26:46 +0000 (13:26 +0800)

Trivial merge