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

Trivial merge