David Monllao 97f4eb11a5 Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle
Conflicts:
	mod/scorm/version.php
	version.php
2015-12-29 10:46:52 +08:00
..