Merge remote-tracking branch 'origin/ability-changes'
authorEevee <git@veekun.com>
Tue, 29 Mar 2011 05:13:33 +0000 (22:13 -0700)
committerEevee <git@veekun.com>
Tue, 29 Mar 2011 05:13:33 +0000 (22:13 -0700)
commita2a1d75837f1ca7ba63e3d2692f54a4454209be2
tree0a4f302d7b9e5a94019ca95ffa758e320c6d4f22
parentbd40dea825c77ba4226a6d8016a3d21e348868ea
parent0575b5d334cc5b98ea3961995785b31eac2c4281
Merge remote-tracking branch 'origin/ability-changes'
pokedex/data/csv/ability_prose.csv