From: Eevee <git@veekun.com>
Date: Tue, 29 Mar 2011 05:13:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/ability-changes'
X-Git-Tag: veekun-promotions/2011041101~25
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/a2a1d75837f1ca7ba63e3d2692f54a4454209be2

Merge remote-tracking branch 'origin/ability-changes'
---

a2a1d75837f1ca7ba63e3d2692f54a4454209be2