From: Zhorken <zhorken@gmail.com>
Date: Sun, 20 Dec 2009 21:08:47 +0000 (-0500)
Subject: Merge branch 'master' of git://veekun.com/pokedex
X-Git-Tag: veekun-promotions/2010050901~117
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/ade0f1d39a23d644fc494cd531f292e6e9586ab2?hp=--cc

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

ade0f1d39a23d644fc494cd531f292e6e9586ab2