Merge proposals dependent on lp://staging/~johnf-inodes/bzr-email/server_support

lp://staging/~johnf-inodes/bzr-email/server_support has no merge proposals.