Merge branch 'MDL-56463_master-fix2' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 18 Nov 2016 03:02:19 +0000 (11:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 18 Nov 2016 03:02:19 +0000 (11:02 +0800)
commitcb3f67364d502f2953333fc8ce328c9d08e13544
tree7c35140d66ed7012e3ad5828eaa2d3466d0360d2
parentaab30ea8281195a010c08933f83a33988fcf9864
parentb14a04e0a458df8ae2c4d700192bc77c148ae65a
Merge branch 'MDL-56463_master-fix2' of git://github.com/dmonllao/moodle