From: Eevee <git@veekun.com>
Date: Wed, 6 Apr 2011 04:04:32 +0000 (-0700)
Subject: Merge branch 'encukou'
X-Git-Tag: veekun-promotions/2011041101~8
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/a04865183fefdd58b0de1cea7c69a9b04a408e53

Merge branch 'encukou'
---

a04865183fefdd58b0de1cea7c69a9b04a408e53