1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 23:51:15 +01:00
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
..