Merge branch 'MDL-37749_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 04:26:03 +0000 (12:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 04:26:03 +0000 (12:26 +0800)

Trivial merge