Merge branch 'MDL-33863_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 08:16:41 +0000 (16:16 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 08:16:41 +0000 (16:16 +0800)

Trivial merge