Merge branch 'wip-MDL-50131-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 May 2015 08:26:45 +0000 (09:26 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 7 May 2015 08:26:45 +0000 (09:26 +0100)

Trivial merge