Merge branch 'MDL-36646_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:12:00 +0000 (15:12 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:12:00 +0000 (15:12 +0800)

Trivial merge