Merge branch 'w07_MDL-24125_20_admintreecache' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 00:38:12 +0000 (01:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 00:38:12 +0000 (01:38 +0100)

Trivial merge