Merge branch 'MDL-39442-copy-addon' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 May 2013 09:00:23 +0000 (10:00 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 May 2013 09:00:23 +0000 (10:00 +0100)
commit473623695948e041135e93b0205a22eb325c45a9
treeb26e9369cf46b07ae4141a4a55ed03bce61eb9a3
parent373a40c5db86211706d715d14acd77308e339f43
parented70c74be5f0f17169dea553b8471f81ae780301
Merge branch 'MDL-39442-copy-addon' of git://github.com/mudrd8mz/moodle

Conflicts:
admin/tool/installaddon/version.php
admin/tool/installaddon/classes/installer.php
admin/tool/installaddon/version.php