Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 05:54:23 +0000 (13:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 05:54:23 +0000 (13:54 +0800)

Trivial merge