From: Christopher Lu <lu@stop.hsd1.pa.comcast.net>
Date: Fri, 9 Jan 2009 06:24:18 +0000 (-0500)
Subject: Merge branch 'master' of nyus.joshuawise.com:/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/ff2b4c9dcaa802e67d12d7b0f84baf0bb2f971dc?hp=--cc

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

ff2b4c9dcaa802e67d12d7b0f84baf0bb2f971dc