Andrew Nicols db23cd087b Merge branch 'MDL-48716-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
	lib/db/upgrade.php
	version.php
2015-02-25 09:20:26 +08:00
..