From: Eevee <git@veekun.com>
Date: Sat, 2 Apr 2011 00:10:13 +0000 (-0700)
Subject: Merge branch 'encukou'
X-Git-Tag: veekun-promotions/2011041101~17
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/98328e173a5568a6c64d3315dfe0c0c4b3a0662d?ds=sidebyside

Merge branch 'encukou'
---

98328e173a5568a6c64d3315dfe0c0c4b3a0662d