Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:59:54 +0000 (12:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:59:54 +0000 (12:59 +0800)

Trivial merge