Merge branch 'MDL-27432_gd_error' of git://github.com/andyjdavis/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 05:56:51 +0000 (13:56 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 05:56:51 +0000 (13:56 +0800)
1  2 
lib/filestorage/file_storage.php

Simple merge