Canonical SSO provider

Merge proposals dependent on lp://staging/~wesmason/canonical-identity-provider/trunk-update-dj-static

  1. trunk-update-dj-static
  2. Dependent merge proposals

lp://staging/~wesmason/canonical-identity-provider/trunk-update-dj-static has no merge proposals.