Merge branch 'MDL-51374-master-new' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 02:13:14 +0000 (10:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 02:13:14 +0000 (10:13 +0800)
commitef474575e107445185c9154c43731223e469b50a
tree2b7752a84227ac19e7d8d93a60fbf42a19e5e800
parent5162ffec0d931d7b48e591f90d3c34d819dc8199
parent87a3e501923de52336566de2a4b36a06b748747a
Merge branch 'MDL-51374-master-new' of git://github.com/lameze/moodle

Conflicts:
lib/db/caches.php
lang/en/cache.php
lib/db/caches.php