Merge branch 'MDL-53019' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 00:15:02 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 00:15:02 +0000 (08:15 +0800)
commit642a1d5480275a52e32ec4fc10f2f03637ebd5ba
treef0999cca57aa2283b8ab7eb20c72589bf1dd8ae6
parent09080694077ff73a97bb595507d7409f42881bec
parentae96cf6246862f7c19daca01e85e905bae3796f2
Merge branch 'MDL-53019' of git://github.com/stronk7/moodle