From: Sam Hemelryk Date: Tue, 23 Jul 2013 02:14:27 +0000 (+1200) Subject: Merge branch 'MDL-40680-master' of git://github.com/danpoltawski/moodle X-Git-Tag: v2.6.0-beta~897 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=deeae9c1553e62d227c9fd1dd3b0776ce405de82 Merge branch 'MDL-40680-master' of git://github.com/danpoltawski/moodle --- deeae9c1553e62d227c9fd1dd3b0776ce405de82