Merge branch 'MDL-38048-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 05:44:55 +0000 (13:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 05:44:55 +0000 (13:44 +0800)

Trivial merge