Merge branch 'MDL-48362-master-fix3' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Mar 2016 04:36:56 +0000 (12:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Mar 2016 04:36:56 +0000 (12:36 +0800)
commit5e785ab08437f7ce92f5b0d288993314263cc752
treee74f9647fd6c84b53c11393c3801e282ef55770c
parentce878562f388facccf823aa5eb849b7f5dc9228c
parent72fcaae76dfdcb4a73bdca4559778fd74e354e55
Merge branch 'MDL-48362-master-fix3' of github.com/damyon/moodle