Merge branch 'MDL-34171_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 10 Jul 2012 01:25:22 +0000 (09:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Jul 2012 01:25:22 +0000 (09:25 +0800)

Trivial merge