Merge branch 'wip-MDL-44640-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 09:13:19 +0000 (10:13 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 09:13:19 +0000 (10:13 +0100)

Trivial merge