Merge branch 'MDL-55326-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 17:01:57 +0000 (19:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 17:01:57 +0000 (19:01 +0200)
commit4c9919fb154121865b2ea20327147271be9f22c3
treedcd6c7f9f3b9faefcd8d196cc76375eed939a735
parent67aaf4eeda587954847ec8e6ee06e515bc93cdcf
parent13659515fd96ab1cfd08b0aa19559acf1ed6274e
Merge branch 'MDL-55326-master' of git://github.com/andrewnicols/moodle