Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github...
authorSam Hemelryk <sam@moodle.com>
Tue, 2 Dec 2014 19:40:37 +0000 (08:40 +1300)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:14:26 +0000 (12:14 +0000)
Conflicts:
mod/imscp/module.js


No differences found