Merge branch 'MDL-34837-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 05:55:14 +0000 (13:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 05:55:14 +0000 (13:55 +0800)

Trivial merge