manual fix up of merge. two broken places still:
- can_view_view needs http://paste.dollyfish.net.nz/0e6800 (see comment in function) - blocktype/mygroups/lib.php is BROKEN (was using get_associated_groups which I guess has been removed. needs updating! I commented out a line to stop it fataling in the meantime.
Showing with 22 additions and 21 deletions