Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 07:00:21 +0000 (15:00 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 07:00:21 +0000 (15:00 +0800)
1  2 
lib/filelib.php

diff --cc lib/filelib.php
Simple merge