Dan Poltawski 5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle ...

Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php

2014-11-05 12:11:16 +00:00

..

classes

…

condition

Merge branch 'MDL-48021' of git://github.com/stronk7/moodle

2014-11-05 12:11:16 +00:00

tests

…

yui

…

renderer.php

…

upgrade.txt

…