Eloy Lafuente (stronk7) d59df6582b Merge branch 'MDL-29808' of git://github.com/timhunt/moodle ...

Conflicts:
	question/type/upgrade.txt

There were already one just added upgrade.txt file so this ended
conflicting. Reviewed the contents, I've deleted the less detailed
note about pluginname, leaving the longer description added by Tim.

Ciao :-)

2011-11-10 21:54:36 +01:00

..

lang/en

…

format.php

…

version.php

…