Sam Hemelryk 0fe5a201c0 Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle
Conflicts:
	mod/assign/locallib.php
	mod/assign/submission/onlinetext/locallib.php
2013-01-15 10:37:54 +13:00
..