Merge branch 'MDL-58165-master' of https://github.com/abias/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 23 May 2017 06:41:42 +0000 (14:41 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 23 May 2017 06:41:42 +0000 (14:41 +0800)
commit5d13738a823ba2a8f542e64cd98afe29ed75f070
treec075c5faf0e143fffc814ede43bd4373d7a73710
parent976e29a17d1bd95029de73170743a5324a5b04b0
parent27456a642252e05266bb64106bb521a67cb34fa8
Merge branch 'MDL-58165-master' of https://github.com/abias/moodle