Merge branch 'MDL-32009-master-1' of git://git.luns.net.uk/moodle

author Sam Hemelryk <sam@moodle.com>

Wed, 4 Apr 2012 02:19:32 +0000 (14:19 +1200)

committer Sam Hemelryk <sam@moodle.com>

Wed, 4 Apr 2012 02:19:32 +0000 (14:19 +1200)
author Sam Hemelryk <sam@moodle.com>
Wed, 4 Apr 2012 02:19:32 +0000 (14:19 +1200)
committer Sam Hemelryk <sam@moodle.com>
Wed, 4 Apr 2012 02:19:32 +0000 (14:19 +1200)
diff --cc lang/en/message.php
Simple merge
diff --cc lib/messagelib.php
Simple merge
diff --cc lib/pluginlib.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Wed, 4 Apr 2012 02:19:32 +0000 (14:19 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Wed, 4 Apr 2012 02:19:32 +0000 (14:19 +1200)
		1	2
lang/en/message.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/messagelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pluginlib.php	patch \|	diff1 \|	diff2 \|	blob \| history