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)
1  2 
lib/db/caches.php
lib/external/externallib.php

Simple merge
Simple merge