Merge branch 'MDL-36259_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 18 Dec 2012 06:26:10 +0000 (14:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Dec 2012 06:26:10 +0000 (14:26 +0800)

Trivial merge