From: Eevee <git@veekun.com>
Date: Mon, 27 Jul 2009 07:09:18 +0000 (-0700)
Subject: Merge branch 'master' of git@veekun.com:pokedex into HEAD
X-Git-Tag: veekun-promotions/2010050901~234
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/ee57dfd4a3c77fc76231aff79ae68c9295d68613?ds=inline;hp=ee57dfd4a3c77fc76231aff79ae68c9295d68613

Merge branch 'master' of git@veekun.com:pokedex into HEAD
---