Merge branch 'MDL-40555-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 07:57:34 +0000 (09:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 07:57:34 +0000 (09:57 +0200)
Conflicts:
cache/stores/static/lib.php

1  2 
cache/stores/static/lib.php
cache/tests/cache_test.php

Simple merge
Simple merge