Merge branch 'MDL-38039_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 08:00:07 +0000 (16:00 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 08:00:07 +0000 (16:00 +0800)

Trivial merge