Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Cont...

author Dan Poltawski <dan@moodle.com>

Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)
diff --cc lib/filelib.php
Simple merge
diff --cc lib/weblib.php
Simple merge
diff --cc theme/yui_image.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)
		1	2
lib/filelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/weblib.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/yui_image.php	patch \|	diff1 \|	diff2 \|	blob \| history