Merge branch 'MDL-36828_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 03:44:40 +0000 (11:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 03:44:40 +0000 (11:44 +0800)

Trivial merge