Merge branch 'MDL-23219_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 06:32:54 +0000 (14:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 06:32:54 +0000 (14:32 +0800)

Trivial merge