Merge branch 'wip-MDL-43719-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 07:22:59 +0000 (15:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 07:22:59 +0000 (15:22 +0800)

Trivial merge