Merge branch 'MDL-34807_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 04:08:04 +0000 (12:08 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 04:08:04 +0000 (12:08 +0800)

Trivial merge