Dan Poltawski 4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-08 16:42:17 +08:00
..
2011-03-01 12:26:49 +01:00
2011-01-14 09:32:17 +01:00
2013-09-10 13:02:35 +12:00