Merge branch 'MDL-20438-update-notification' of git://github.com/mudrd8mz/moodle

author Dan Poltawski <dan@moodle.com>

Wed, 4 Apr 2012 03:17:43 +0000 (11:17 +0800)

committer Dan Poltawski <dan@moodle.com>

Wed, 4 Apr 2012 03:17:43 +0000 (11:17 +0800)
author Dan Poltawski <dan@moodle.com>
Wed, 4 Apr 2012 03:17:43 +0000 (11:17 +0800)
committer Dan Poltawski <dan@moodle.com>
Wed, 4 Apr 2012 03:17:43 +0000 (11:17 +0800)
diff --cc lib/db/messages.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
diff --cc lib/pluginlib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Wed, 4 Apr 2012 03:17:43 +0000 (11:17 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Wed, 4 Apr 2012 03:17:43 +0000 (11:17 +0800)
		1	2
lib/db/messages.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pluginlib.php	patch \|	diff1 \|	diff2 \|	blob \| history