From: Sam Hemelryk Date: Mon, 9 Dec 2013 21:27:45 +0000 (+1300) Subject: Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle X-Git-Tag: v2.7.0-beta~957 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=fd0281dfc3461cb23580eda9ecb8d7364044a987;hp=-c Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle --- fd0281dfc3461cb23580eda9ecb8d7364044a987