Dan Poltawski a4051353d1 Revert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle"
This reverts commit 296c0247c6cc9e525721fc92b5a78c7146e6887d, reversing
changes made to 2511b0742a3695298d8216fe9723581c089909d7.

Conflicts:

	lib/db/upgrade.php
	version.php
2012-03-29 16:07:30 +08:00
..