Merge branch 'w33_MDL-29031_m22_oldblock' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 00:03:19 +0000 (02:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 00:03:19 +0000 (02:03 +0200)

Trivial merge