Merge branch 'MDL-56594-master' of git://github.com/damyon/moodle
commit6a17bdec92180c0a8c5cdfc149984b7fbce4debe
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Oct 2016 08:47:51 +0000 (27 10:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Oct 2016 08:47:51 +0000 (27 10:47 +0200)
treeb8e1b8c37572462d43c1b34b5044540a61d4b499
parent77cfc19a850bd88e7d67fb4bfb19988ce2d118f7
parent9de8c56136744fd69833f8135359cbe0014369d8
Merge branch 'MDL-56594-master' of git://github.com/damyon/moodle