Merge branch 'wip-MDL-43700-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 04:24:38 +0000 (12:24 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 04:24:38 +0000 (12:24 +0800)

Trivial merge