From: Dan Poltawski Date: Tue, 23 Feb 2016 14:36:54 +0000 (+0000) Subject: Merge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle X-Git-Tag: v3.1.0-beta~500 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=fef5360053693ae95ea17aa48c948405a01491e5 Merge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle --- fef5360053693ae95ea17aa48c948405a01491e5