Merge branch 'MDL-53304' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 05:26:12 +0000 (13:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 05:26:12 +0000 (13:26 +0800)
commit8e9cafbee7cde3f74b28693dcbce4a5b8dc53444
tree41d9a53449ecc8c1e926527bd72c659122e686f5
parent2e2e4caa7ef9d522d20ae6eca90b18cc418a964a
parent81e47a35e8bb98a94ea88e45eee63dcda1b46f74
Merge branch 'MDL-53304' of git://github.com/timhunt/moodle