Sam Hemelryk c709fafc6e Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2014-10-08 11:16:54 +13:00
..