From: Sam Hemelryk Date: Tue, 10 Dec 2013 21:34:17 +0000 (+1300) Subject: Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle X-Git-Tag: v2.7.0-beta~944 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=ebb9daa5e1cf196b6f7fde63ed5127a867d1f80b Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle --- ebb9daa5e1cf196b6f7fde63ed5127a867d1f80b