From: David Monllao Date: Mon, 23 May 2016 06:52:54 +0000 (+0800) Subject: Merge branch 'MDL-54642-master' of git://github.com/ryanwyllie/moodle X-Git-Tag: v3.2.0-beta~1087 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=21eef944363266d14b3a9c3bf2b45e47652de480 Merge branch 'MDL-54642-master' of git://github.com/ryanwyllie/moodle --- 21eef944363266d14b3a9c3bf2b45e47652de480