From: Nick Retallack <nickretallack@gmail.com>
Date: Mon, 7 Dec 2009 02:05:00 +0000 (-0800)
Subject: merged suff, commented out some of my own
X-Git-Url: http://git.veekun.com/zzz-floof.git/commitdiff_plain/490b45cdc311a09db0266a3f974289e3979bf2ea?hp=490b45cdc311a09db0266a3f974289e3979bf2ea

merged suff, commented out some of my own
---