Merge branch 'wip-MDL-57216-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 09:04:04 +0000 (09:04 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 09:04:04 +0000 (09:04 +0000)
commit8791d254af576ff397265038fc9904fc7a16bdb7
tree59b456468d3684e90874326baafd6a8c9118d814
parentb7f0ab491cce605fae53bb79eb05e74c5f0faa25
parentbfb43c64d80787374e24fd48a2d3ad82a9a7c0fd
Merge branch 'wip-MDL-57216-master' of git://github.com/abgreeve/moodle