Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 10:10:26 +0000 (18:10 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 10:10:26 +0000 (18:10 +0800)
commita56dc903208e1f50c2f85bf823fb4b94eef65d82
treef69cd82dcbb72adcaab70d4c7a6f0460cb3cdc18
parentaa8739776cc1cdf2426b40eedaade9d86faca291
parent8a6411991e7385f7d590087bb50b88891cf9fc8a
Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle

Conflicts:
version.php
files/renderer.php
lang/en/moodle.php
lib/filelib.php
lib/form/dndupload.js
lib/form/filemanager.js
repository/draftfiles_manager.php
repository/filepicker.js
repository/filepicker.php
version.php