Merge branch 'MDL-31509_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 04:15:49 +0000 (12:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 04:15:49 +0000 (12:15 +0800)

Trivial merge