Merge branch 'MDL-59032-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 23:28:13 +0000 (01:28 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:42 +0000 (12:30 +0100)
commit1e34274846067747f45cf2025ce171936de255eb
treea91a8b37b034bcab13c1cb0c3d7db74d69c7232d
parent29a063a13fd25fae39340de4059df904690be8b1
parent4c8deb9cfad080085819494c0deba2c69fa399d4
Merge branch 'MDL-59032-master' of git://github.com/damyon/moodle