Merge branch 'm24_MDL-36364_Improve_the_deletion_logic' of https://github.com/scara...
authorDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 07:24:24 +0000 (15:24 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 07:24:24 +0000 (15:24 +0800)
commitbc8f1957a433e505539d0b60e3ed6c4e8da236b1
tree2c4a13854126ef4d753373feee762ef1fa861e18
parentaeb8e7878513e234c98a5b7e95071bad3358a243
parentf86ce2dcb6b537fba960c4ed5cc8d1c8ec5d1e4f
Merge branch 'm24_MDL-36364_Improve_the_deletion_logic' of https://github.com/scara/moodle

Conflicts:
cache/stores/file/lib.php
cache/stores/file/lib.php