Dan Poltawski f5bacd6539 Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/upgrade.txt
    lib/db/upgrade.php
	version.php
2014-10-06 18:06:13 +01:00
..
2013-11-01 08:55:29 +08:00
2011-10-19 01:17:43 +02:00
2012-11-19 10:03:50 +08:00