sethlilly/Vapor — pull request #31 by toonketels (2014-05-23 17:08:31+00:00)
Title: Fixed commit merge conflict.

The footer of the 1.4 branch displays some leftovers of a git merge conflict. Removed it.