Merge branch 'MDL-60094-master' of https://github.com/abias/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:50:37 +0000 (01:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:50:37 +0000 (01:50 +0200)
commit66286d57682120699ecf310b8c62076a805a7629
treea560cf989daa4a097c5dd7c44bd3c91785eb0063
parentdffca4994500b80ebc15abfb0a4f248b9eb19316
parentaf25a2b739bc6611c1f220b7c7edb1f569362b80
Merge branch 'MDL-60094-master' of https://github.com/abias/moodle