From: Zhorken <zhorken@gmail.com>
Date: Wed, 28 Apr 2010 07:59:04 +0000 (-0400)
Subject: Merge branch 'master' of git@veekun.com:pokedex
X-Git-Tag: veekun-promotions/2010050901~20
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/cfbbcdee866e534ca53d8a019ace48c713ac778f

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

cfbbcdee866e534ca53d8a019ace48c713ac778f