Dan Poltawski b2ab6cc330 Merge branch '27548-29' of git://github.com/samhemelryk/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2014-12-01 12:21:19 +00:00
..