From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Sun, 28 Dec 2008 11:00:58 +0000 (-0500)
Subject: Merge nyus:/storage/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/48775efdc0074dd9a772e37ae43adf58b5c9be8c?hp=48775efdc0074dd9a772e37ae43adf58b5c9be8c

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