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)
commit3f0a8871d3f819b8d314133a4ae23fa419fdcaa5
tree8595dd6b2acca7368ad2c5ed35bd7def1834f263
parent259e3c25250077c8cc3953f7a82a5d87e761aa2d
parent4a749e93b48795d97596355d1483647662aaff5a
Merge branch 'MDL-40555-master' of git://github.com/FMCorz/moodle

Conflicts:
cache/stores/static/lib.php
cache/stores/static/lib.php
cache/tests/cache_test.php