Merge branch 'MDL-51779_master' of https://github.com/Syxton/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2015 01:46:38 +0000 (09:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2015 01:46:38 +0000 (09:46 +0800)
commit3363cbe55b1d365034a3cd6ae3ea47fcb3b69529
tree722c61bb65cd7448fac411c3b2704405f213fc27
parent8b3090c13b911461982a28d25dd933fb9f50d3c7
parent626d8335439b91cef1d73ef4a27714dce67e82a9
Merge branch 'MDL-51779_master' of https://github.com/Syxton/moodle