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

Trivial merge