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)
commit6155915ffbba47b36be1a17d8d6cddb99182130e
treef8d5c0587d937cea57c3a5c34e182f8281f657f2
parentfe856690cbc219cf1287ebacf8be41d92be06edf
parenta037c943bd8deb28ab485ef4408a21992dd78c9e
Merge branch 'wip-MDL-36363-m25' of https://github.com/samhemelryk/moodle
cache/locallib.php