Damyon Wiese 52ed065131 Merge branch 'MDL-46706-master' of https://github.com/sammarshallou/moodle
Conflicts:
	lib/tests/modinfolib_test.php
2014-08-19 17:13:05 +08:00
..