Merge branch 'MDL-57791_master-fix2' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Jul 2017 00:27:36 +0000 (08:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Jul 2017 00:27:36 +0000 (08:27 +0800)
commite392b8bb2f229a7e03596f574da80c71810d081c
treed7fc6065a3103a4ee99ca93e53c5567e9fc284fc
parente3f17b9fdbb3bbc86a45ef02bc2c58fb92eb5f2e
parent466f683aa626e777a6a014575eb27d9594d9425b
Merge branch 'MDL-57791_master-fix2' of git://github.com/dmonllao/moodle