Merge branch 'MDL-36616-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:48:30 +0000 (11:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:48:30 +0000 (11:48 +0800)

Trivial merge