Merge branch 'wip-MDL-45036-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:50:06 +0000 (10:50 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:50:06 +0000 (10:50 +0800)

Trivial merge