Merge branch 'MDL-54965-master' of git://github.com/tobiasreischmann/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Jul 2017 11:41:28 +0000 (13:41 +0200)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 12:43:16 +0000 (13:43 +0100)
commit64ea4b5edd539568d24992e6f740442bcf0d91f8
treec089886bae5042ce408a103393481e99885018cd
parente78d7cc0b1f94d2725a89d9aaa5a401c38147e66
parent3a133b30289d7d4b70939e133f9f6ea8f6d21018
Merge branch 'MDL-54965-master' of git://github.com/tobiasreischmann/moodle