Merge branch 'MDL-36456-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:31:10 +0000 (10:31 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:31:10 +0000 (10:31 +0800)

Trivial merge