Merge branch 'wip-MDL-50917-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 08:15:57 +0000 (09:15 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 08:15:57 +0000 (09:15 +0100)

Trivial merge