Merge branch 'wip-MDL-37474-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 00:32:09 +0000 (01:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 00:32:09 +0000 (01:32 +0100)
1  2 
cache/locallib.php

Simple merge