Dan Poltawski 786cd60ee3 Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle
Conflicts:
	course/format/weeks/format.js
	course/format/weeks/lib.php
2012-05-29 15:21:55 +08:00
..