Merge branch 'MDL-34379_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jul 2012 06:14:08 +0000 (14:14 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jul 2012 06:14:08 +0000 (14:14 +0800)

Trivial merge