From: Eevee <git@veekun.com>
Date: Mon, 6 Jul 2009 00:16:29 +0000 (-0700)
Subject: Merge branch 'master' of git@veekun.com:pokedex
X-Git-Tag: veekun-promotions/2010050901~251
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/2c0980e4dcadaa31d7ea7ebab174a6fd81723090

Merge branch 'master' of git@veekun.com:pokedex
---

2c0980e4dcadaa31d7ea7ebab174a6fd81723090