Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 May 2012 02:30:22 +0000 (10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 May 2012 02:30:22 +0000 (10:30 +0800)
commit7e89cbe0ac3f18b3845599264e797a816bab3d8d
treebd3a648da1e211fdf7aad2e016ce7c9d8e012acf
parent79f3d0e027fc64d2c52959a61d1e102052bed178
parent386b67d100aadaec26c862b73c092a8b4632ce73
Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle
mod/data/lang/en/data.php
mod/data/lib.php
mod/forum/lang/en/forum.php
mod/forum/lib.php
mod/glossary/lang/en/glossary.php
mod/glossary/lib.php