Merge branch 'MDL-29945' of git://github.com/timhunt/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)
diff --cc lang/en/plugin.php
Simple merge
diff --cc lib/pluginlib.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)
		1	2
lang/en/plugin.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pluginlib.php	patch \|	diff1 \|	diff2 \|	blob \| history