Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Cont...
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)
1  2 
lib/filelib.php
lib/weblib.php
theme/yui_image.php

diff --cc lib/filelib.php
Simple merge
diff --cc lib/weblib.php
Simple merge
Simple merge