From: Dylan Lloyd <dylan@miniscule>
Date: Wed, 27 Jun 2012 06:37:54 +0000 (-0400)
Subject: Merge branch 'dev' of dl:dylansserver into dev
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=08d7e1f799b17025cc1066b1e9b09e1b44c66a67;hp=-c;p=dylansserver.git

Merge branch 'dev' of dl:dylansserver into dev
---

08d7e1f799b17025cc1066b1e9b09e1b44c66a67