edprats/lamersvp — pull request #1 by flores (2012-04-16 23:56:22+00:00)
Title: Hopefully this resolves our broken merges...

<3