From: Marina Glancy Date: Thu, 7 Nov 2013 05:31:01 +0000 (+1100) Subject: Merge branch 'MDL-42697-master' of git://github.com/andrewnicols/moodle X-Git-Tag: v2.6.0-rc1~93 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=afd765337ad0cb8bdccfae829bc325daa6b9e136 Merge branch 'MDL-42697-master' of git://github.com/andrewnicols/moodle --- afd765337ad0cb8bdccfae829bc325daa6b9e136