From: Eevee <git@veekun.com>
Date: Tue, 29 Mar 2011 15:06:34 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/encukou'
X-Git-Tag: veekun-promotions/2011041101~24
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/c0c111bb674c04565fc86c50435c0ce0fb0ca3f3?hp=-c

Merge remote-tracking branch 'origin/encukou'
---

c0c111bb674c04565fc86c50435c0ce0fb0ca3f3