Merge branch 'wip-MDL-30912-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jul 2012 04:11:48 +0000 (12:11 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Jul 2012 04:11:48 +0000 (12:11 +0800)

Trivial merge