Merge branch 'wip-MDL-36363-m25' of https://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 11:06:33 +0000 (12:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 11:06:33 +0000 (12:06 +0100)
1  2 
cache/locallib.php

Simple merge