Merge branch 'MDL-35983_equella_filename_dev' of git://github.com/dongsheng/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 14:23:49 +0000 (14:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 14:23:49 +0000 (14:23 +0000)
1  2 
repository/equella/callback.php

Simple merge