Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle

diff --cc mod/data/lang/en/data.php
Simple merge

diff --cc mod/data/lib.php
Simple merge

diff --cc mod/forum/lang/en/forum.php
Simple merge

diff --cc mod/forum/lib.php
Simple merge

diff --cc mod/glossary/lang/en/glossary.php
Simple merge

diff --cc mod/glossary/lib.php
Simple merge