Merge branch 'MDL-58749' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 00:23:27 +0000 (08:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 00:23:27 +0000 (08:23 +0800)
commit5e7de08be505246c0417c8190b95f38997565830
tree0a254ed631339c639c2bcf9934fa0c2a6ce7d822
parent97b93cafef21545f281b134ec2b6bb17e9452cf9
parent2df7f223b8d91dd7b21c9fc31b3dc859ff3466df
Merge branch 'MDL-58749' of git://github.com/stronk7/moodle