Merge branch 'MDL-53228-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 03:35:54 +0000 (11:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 03:35:54 +0000 (11:35 +0800)
commita28ed1a7318afb3e6f014cc1766b6b593ace97d9
treed9a57cfe02f1324e803ebe56964f40796c113650
parent0c7cca226d3e80a5de99170a734c81ed9fa02357
parent95b3ad671a345ed340fcd9818d3044db9553cae0
Merge branch 'MDL-53228-master' of git://github.com/andrewnicols/moodle