Merge branch 'MDL-33982-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 17 Sep 2012 08:03:35 +0000 (16:03 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Sep 2012 08:03:35 +0000 (16:03 +0800)

Trivial merge