From: Christopher Lu <lu@stop.hsd1.pa.comcast.net>
Date: Sun, 28 Dec 2008 10:23:33 +0000 (-0500)
Subject: Merge branch 'master' of nyus.joshuawise.com:/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/4caf81e0cb02f814642cd7dc1a1d5ac05415415e?ds=sidebyside

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

4caf81e0cb02f814642cd7dc1a1d5ac05415415e