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

Trivial merge