Damyon Wiese 82d341cfd5 Merge branch 'MDL-49503-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
	version.php
2015-04-07 20:28:23 +08:00
..