Merge branch 'wip-MDL-36453-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:31:53 +0000 (14:31 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:31:53 +0000 (14:31 +0800)

Trivial merge