make the merging command more clever about competing sign-offs on both branches, take the newest push
make the merging command more clever about competing sign-offs on both branches, take the newest push

Pike/elmo,AdrianGaudebert/elmo,AdrianGaudebert/elmo,mozilla/elmo,mozilla/elmo,Pike/elmo,mozilla/elmo,mozilla/elmo,AdrianGaudebert/elmo,Pike/elmo,Pike/elmo