Merge branch 'wip-MDL-36466-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:38:53 +0000 (13:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:38:53 +0000 (13:38 +0800)
1  2 
cache/README.md
cache/classes/config.php
cache/classes/dummystore.php
cache/locallib.php

diff --cc cache/README.md
Simple merge
Simple merge
Simple merge
Simple merge