Damyon Wiese 006fac90a1 Merge branch 'MDL-49498-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
	version.php
2015-04-07 14:27:20 +08:00
..