Limie/marty-nerdland — pull request #1 by XULRunner42 (2012-11-05 13:38:27+00:00)
Title: Merge Failure on server

If you pull my repo, you will probably notice the merge failure that left your article in such a sad looking state. I do not think you meant to mention 613565e5c5e7 ... but here we are.

Also, the server should not go down when I leave the house anymore.