Merge branch 'MDL-29808' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 20:54:36 +0000 (21:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 20:54:36 +0000 (21:54 +0100)
commitd59df6582bd4c1b5a85a0907d76ac6e2b28da8e1
treebf54659ff42b7d6a26b3c9158ead96fb2dc893ef
parent47c6991a8e287b961f2b685360460b83f34b4cc4
parent226b312472b4b092a3bbacbff94254717ff84d3f
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 :-)
lib/pluginlib.php
question/type/questiontypebase.php
question/type/upgrade.txt