From: Christopher Lu <lu@stop.hsd1.pa.comcast.net>
Date: Fri, 26 Dec 2008 11:55:05 +0000 (-0500)
Subject: Merge branch 'master' of nyus.joshuawise.com:/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/9516520942af5c7dd24b0323b164c4ea2bd1dc01?hp=-c

Merge branch 'master' of nyus.joshuawise.com:/git/firearm
---

9516520942af5c7dd24b0323b164c4ea2bd1dc01