Dan Poltawski 0c918a1f52 Merge branch 'wip-MDL-16660-m24' of git://github.com/samhemelryk/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-10-30 14:18:13 +08:00
..