Merge branch 'MDL-37964_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 04:27:02 +0000 (12:27 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 04:27:02 +0000 (12:27 +0800)

Trivial merge