Merge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2016 00:59:31 +0000 (01:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2016 00:59:31 +0000 (01:59 +0100)
commitd9dfc410ad0de621d987e8e0db1b8029c1e4d7ae
tree7380f66db53f9aab52d09b736401eadfa86b0d80
parent80f79ad6ec47c8b7edc4c9ac677fa71ed10ba2de
parentb259fa6645cc092ac9e7faed6554df5b37b1c83d
Merge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle
lib/db/caches.php
lib/external/externallib.php