Merge branch 'MDL-46455-master-20151012' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 13 Oct 2015 03:42:40 +0000 (11:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 13 Oct 2015 03:42:40 +0000 (11:42 +0800)
commitee58df52da9a7a0195f85169175a14df83d537fa
treea560282a7ab4369e0e912fe14b458dee2f7eff3c
parent5e2547612fe5c4a09dac835f5b8b1a062644ac67
parentac82a9a8b4c73f8e7ee734d1563bcf851f3c66e6
Merge branch 'MDL-46455-master-20151012' of git://github.com/damyon/moodle