3a02ce6 Merge "/distribution/beaker/setup: allow merging with base ref, instead of just checking out" into develop

1 file Merged by Dan Callaghan 10 years ago, Committed by Gerrit Code Review 10 years ago,