jimbojw/corridor — pull request #30 by jimbojw (2013-09-04 02:50:08+00:00)
Title: Feature/merge auto

Implements feature #26, intelligent merge with option.