Merge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 04:50:46 +0000 (16:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 04:50:46 +0000 (16:50 +1200)
1  2 
lib/filelib.php

diff --cc lib/filelib.php
Simple merge