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

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

f942975c0a890e840bdb9af195229bbdc9a458a5