Merge branch 'MDL-53548-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 01:20:33 +0000 (09:20 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 01:20:33 +0000 (09:20 +0800)
commit52c6e158e04c04fbc8f69271755583a74bc73d46
treecfb81394066fd4b18ef5b25b39b63d089019ad67
parentef67e6c5f8c2f1d3678f42d530e3f75fd763badf
parentf3474e2216aec1b46e98d73aca7d280f995dc188
Merge branch 'MDL-53548-master' of https://github.com/sammarshallou/moodle