From: Marina Glancy Date: Thu, 24 Oct 2013 03:15:05 +0000 (+1100) Subject: Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle X-Git-Tag: v2.6.0-rc1~314 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=33c4c3a3633ce37f2ba9e0f5394def52251e1a94 Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle --- 33c4c3a3633ce37f2ba9e0f5394def52251e1a94