Dan Poltawski 89c3afc2c5 Merge branch 'MDL-49347-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
	version.php
2015-04-07 20:25:28 +01:00
..