Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Feb 2014 02:47:20 +0000 (10:47 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Feb 2014 02:47:20 +0000 (10:47 +0800)
commit3d4cec649aac123bbc1c648b1a291606729e8f24
tree15f8c30619cf1ae80a952b88a3658ad6af5f6d61
parent63e604f8b198c1a19c703b93b0485e40a597be96
parenta2a7726f54da2f8c017fd6daf6e933c9d51ce09f
Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle
mod/imscp/index.php
mod/imscp/view.php