Merge branch 'MDL-33885-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 9 Jul 2012 02:31:52 +0000 (10:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Jul 2012 02:31:52 +0000 (10:31 +0800)

Trivial merge