Merge branch 'MDL-58907_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 23:02:35 +0000 (01:02 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:40 +0000 (12:30 +0100)
commitbf3b9e57b8f2740ccc7e43cd34a602663b5795d7
treef6f6f75997c167be559d13e06a0480446193feab
parent0c272e07e2ca002c622d5b53c1a130eab64a7c19
parent0ecb3d77863a018ef8fc92cff944d57e821754d8
Merge branch 'MDL-58907_master' of git://github.com/markn86/moodle