Damyon Wiese 7bf602d9d3 Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
2013-04-03 14:32:11 +08:00
..