tree 5460b732bb17e5a5f6deeb28e6bbf57808ceb47a
parent b61a0defac8cdcc904ec6be2a2307a04fd83ef82
parent ea738c426d4fd7f5127af2cf387de3989f4ca3fa
author David Pursehouse <dpursehouse@collab.net> 1529235456 +0900
committer David Pursehouse <dpursehouse@collab.net> 1529235456 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Move assertion on protected projects into ProtectedProjects
  Improve error message when protected project cannot be deleted

Change-Id: I7ec40be6851b9b395f51c4e220227219fc8c657f