Dan Poltawski 63cc7cfc61 Merge branch 'MDL-48675' of git://github.com/jmvedrine/moodle
Conflicts:
	mod/lesson/upgrade.txt
2015-01-15 08:34:58 +00:00
..