Merge branch 's11_MDL-28284_filepicker_module_master' of git://github.com/dongsheng...
authorSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 05:42:44 +0000 (13:42 +0800)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 05:42:44 +0000 (13:42 +0800)
1  2 
lib/outputrequirementslib.php

Simple merge