Merge branch 'MDL-50540-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 06:41:20 +0000 (14:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 06:41:20 +0000 (14:41 +0800)
commit2ceaa5752fb0c7f6ffe8524a418a52ac1c65b5a7
tree35fdedeaa75fd556862e425d120958ca3f149e84
parent4ee10fec434a1bbd30b646cea255e9b014f7bc2a
parentbf5bbe01272f76ceaa5c595a460036f13618eaa0
Merge branch 'MDL-50540-master' of git://github.com/FMCorz/moodle