Merge branch 'MDL-58482-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 21 Apr 2017 01:04:32 +0000 (09:04 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 21 Apr 2017 01:04:32 +0000 (09:04 +0800)
commit7a7dbe1b7af544b0fac229fa7a48614fcaee3f4c
treebfd45dca8d8b32aea90053f41afaff8b73411a19
parent470781609590fed14ed17e1001a34b141ab753d9
parentff54d94bd1d848a00efb6af15aa23d9a2e3cecc1
Merge branch 'MDL-58482-master' of git://github.com/lameze/moodle