Merge branch 'MDL-59921-master-fix2' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 01:49:49 +0000 (09:49 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 01:49:49 +0000 (09:49 +0800)
commit5bc84e9f178b305d2def1cf9e5aa1649d3e0da7c
treec21a3b986c9847f531f29af311d1b44a48c1fe1a
parentb43a99ad9209bd781e9f8eb3efa39fc29fb6dcfb
parent2ab3787e18141da642f20a85cd76c1de89be6de5
Merge branch 'MDL-59921-master-fix2' of git://github.com/lameze/moodle