Merge branch 'MDL-36266-notification-subject' of git://github.com/mudrd8mz/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 6 Nov 2012 03:59:24 +0000 (11:59 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 6 Nov 2012 03:59:24 +0000 (11:59 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 03:59:24 +0000 (11:59 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 03:59:24 +0000 (11:59 +0800)
diff --cc lang/en/admin.php
Simple merge
diff --cc lib/pluginlib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 6 Nov 2012 03:59:24 +0000 (11:59 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 6 Nov 2012 03:59:24 +0000 (11:59 +0800)
		1	2
lang/en/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pluginlib.php	patch \|	diff1 \|	diff2 \|	blob \| history