Merge branch 'w52_MDL-30950_m23_adminblock' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jan 2012 21:33:11 +0000 (22:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jan 2012 21:33:11 +0000 (22:33 +0100)

Trivial merge