Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 14:39:45 +0000 (16:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 14:39:45 +0000 (16:39 +0200)

Trivial merge