Dan Poltawski 4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle ...

Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php

2013-10-08 16:42:17 +08:00

..

cli

…

lang/en

…

tests

Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle

2013-10-08 16:42:17 +08:00

index.php

…

locallib.php

…

renderer.php

…

settings.php

…

steps_definitions_form.php

…

styles.css

…

version.php

…