Commit 1b82f7b6a218080df8ff292ab12de744226a9979

Edward Thomson 2015-10-27T14:24:51

merge: compute octopus merge bases