Merge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 02:10:38 +0000 (10:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 02:10:38 +0000 (10:10 +0800)
commit346cf5abb9429d23371ed07aed22c0d0413bb524
treec39046b0be5390022e7341d3f24a5e745da155c0
parentb34d7e700b32b21765efa788f8173ab96276bcc3
parent30452f23cb331512a62aebe601f017cfb02e2bcf
Merge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle