Merge branch 'MDL-34484_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 24 Jul 2012 07:40:26 +0000 (15:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Jul 2012 07:40:26 +0000 (15:40 +0800)

Trivial merge