From: Sam Hemelryk Date: Sun, 28 Jul 2013 22:49:40 +0000 (+1200) Subject: Merge branch 'MDL-40806-m' of git://github.com/andrewnicols/moodle X-Git-Tag: v2.6.0-beta~838 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=6269efd29b84d6c54c2f08140f17e50d3c464b96 Merge branch 'MDL-40806-m' of git://github.com/andrewnicols/moodle --- 6269efd29b84d6c54c2f08140f17e50d3c464b96