Merge proposals dependent on lp://staging/~twom/launchpad/branch-permissions-for-gitapi-backup

1. branch-permissions-for-gitapi-backup
2. Dependent merge proposals