Merge branch 'mdl58161-master' of https://github.com/tlock/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 23:21:35 +0000 (01:21 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:41 +0000 (12:30 +0100)
commit8a55a41f88dd11f12b83d1181c439d72290c9e6d
treec0741126f4ca252a87f00e7984153b224d1a6c92
parent4009603025fc94fd04a76f94b268485769cf1098
parentd621396fee654f96000230108bb2772a012db6ff
Merge branch 'mdl58161-master' of https://github.com/tlock/moodle