post-forking/post-forking — pull request #81 by aaronjorbin (2013-09-10 17:24:31+00:00)
Title: Fix blank lines being removed on merge

Includes a test.