Merge branch 'MDL-45172_block' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Apr 2014 08:40:22 +0000 (16:40 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Apr 2014 08:40:22 +0000 (16:40 +0800)

Trivial merge