Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 23:08:37 +0000 (01:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 23:08:37 +0000 (01:08 +0200)
commitf87559946253e7e8ef7ec1e987ae61095779db8e
treecaf040fa9afc1e08df3e94b4f0f2dd14ccf6b80b
parentdf7995e3a0df0b800daaaa16e0a75d47ff445bb5
parentac2b2713bacc0542b992f3b2037c1976b418d965
Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt
lib/upgrade.txt