From: Marina Glancy Date: Tue, 24 Jun 2014 05:32:13 +0000 (+0800) Subject: Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle X-Git-Tag: v2.8.0-beta~690 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=5c5d182301723047964c91e5700c6f5cc0e98ef9 Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle --- 5c5d182301723047964c91e5700c6f5cc0e98ef9