Merge branch 'MDL-59133-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 23:25:52 +0000 (01:25 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:42 +0000 (12:30 +0100)
commit29a063a13fd25fae39340de4059df904690be8b1
treec7c1d54ac52d8582d2a20ea47f52003ed9764e62
parente0f8686f39718a97211269c089678cf28090c17f
parent63130e328d9f901ae8233e1f78244e0c0ea90d7e
Merge branch 'MDL-59133-master' of git://github.com/jleyva/moodle