Merge branch 'MDL-36023-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE...
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 01:36:08 +0000 (09:36 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 01:36:08 +0000 (09:36 +0800)

Trivial merge