From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Sun, 28 Dec 2008 09:42:12 +0000 (-0500)
Subject: Merge nyus:/storage/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/932d2ed6999912bd7a85a3972a48109c127570f3?ds=inline

Merge nyus:/storage/git/firearm
---

932d2ed6999912bd7a85a3972a48109c127570f3