Merge branch 'MDL-51461' of https://github.com/andrewhancox/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Oct 2015 03:41:10 +0000 (11:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:32 +0000 (16:31 +0100)
commit7a191981b63e6a10a16213fffb5d694e81d47bdd
tree5b29de5d5e077ec164b8ca6d2695e0db6c717d46
parent2dcbd2a27d5d7a81800067ee8533d110d6b9688e
parente56e7c164dd13711ea07f4243234236021f9e630
Merge branch 'MDL-51461' of https://github.com/andrewhancox/moodle