David Monllao ca7b16fa70 Merge branch 'MDL-54638' of git://github.com/stronk7/moodle
Conflicts:
	mod/lti/version.php
2016-05-19 13:47:22 +08:00
..