Merge branch 'MDL-34705_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 03:31:38 +0000 (11:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 03:31:38 +0000 (11:31 +0800)

Trivial merge