Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:39:03 +0000 (11:39 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:39:03 +0000 (11:39 +0800)
1  2 
lib/filelib.php

diff --cc lib/filelib.php
Simple merge