From: Christopher Lu <lu@stop.hsd1.pa.comcast.net>
Date: Mon, 5 Jan 2009 07:48:26 +0000 (-0500)
Subject: Merge branch 'master' of nyus.joshuawise.com:/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/bb9c978c66f4a1fa30ce276e880abe648c4b8881

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

bb9c978c66f4a1fa30ce276e880abe648c4b8881