Merge branch 'MDL-41033' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:24:12 +0000 (09:24 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:24:12 +0000 (09:24 +1200)
1  2 
lib/outputrequirementslib.php
repository/filepicker.js

Simple merge
Simple merge