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)
commitd7ef1ac747ca42cac4c5fdf2badf3d377a525310
tree2f1b50be043e537fd3f683f5de8a22fb8d51027c
parent54de59e70ac3d03002f6ae97cd8e9aef4b51409e
parent40d230162c15bc358af8639ff01a2351c7a84b2e
Merge branch 'MDL-45172_block' of https://github.com/andyjdavis/moodle