Originate/git-town — pull request #76 by charlierudolph (2014-10-14 16:38:07+00:00)
Title: Git ship merge master before squash merging

Squash merge should no longer error.