Damyon Wiese 1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle
Conflicts:
	lib/tests/moodlelib_test.php
	version.php
2013-02-11 14:51:11 +08:00
..