tree b59d9130decc7c59959338141dc3ed075c18dd22
parent a4c0694b9acecb57260ef3293cf160e63edc0076
parent 6b4f1ee9990a8e3a32498fd2e13c8e0d57fa57b8
author David Pursehouse <dpursehouse@collab.net> 1504739722 +0900
committer David Pursehouse <dpursehouse@collab.net> 1504739722 +0900

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Setup: Fix typo in method name
  Option to setup a copy of the master site during init

Change-Id: I9bd02845d4ff7bb5d5170f423fe817faf1cb8700