tree 99e18f235f302befa4a87c43306b56a47dc1a3f8
parent 93ab1609a4ba32e9466ff0649317b84a211285ad
parent 8bc97a106a46a0f32350396e74769af11ec7b98e
author David Pursehouse <dpursehouse@collab.net> 1507855562 +0900
committer David Pursehouse <dpursehouse@collab.net> 1507855568 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  Document which branches must be replicated to replicate the account data

Change-Id: Ic4d1fdc228fd1c5c2da51a8f816ff796f9bfb26e