Merge branch 'MDL-59367-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Jul 2017 06:03:22 +0000 (14:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Jul 2017 06:03:22 +0000 (14:03 +0800)
commit9e27e298c3b26ce3faa9ee9c0341b080210498c2
tree86f68ab8764c3fa0ddb9dfffb05508f2886ee387
parentb67caad9f5830e7df34e2f757795e62f33844f48
parente640eb5cc30f11a27340090b04c3ae6aa6b56dae
Merge branch 'MDL-59367-master-fix2' of github.com/damyon/moodle