group
Merge branch 'master' of
git@github.com:VERSION2-Inc/moodle-block_quickmailjpn.git

Conflicts:
	manageusers.php