MDL-40903 fixed merge conflicts against integration
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:14:49 +0000 (09:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:19:56 +0000 (09:19 +1200)
commit0c5cb2bf22c010604c3feeec0e181502d5d0e16d
treebdc64b5a3065816aab18a4c9a9687f5ea577bb69
parentb51fed38f2c65bf6cdbda05f59fec4ec1684bf03
MDL-40903 fixed merge conflicts against integration
lib/db/caches.php