Merge branch 'master' of eevee@tekkanin.veekun.com:dev/pokedex
authorEevee <git@veekun.com>
Mon, 23 Mar 2009 01:14:44 +0000 (21:14 -0400)
committerEevee <git@veekun.com>
Mon, 23 Mar 2009 01:14:44 +0000 (21:14 -0400)
commitf1622fdeced5b718159f8b059521c6e7356be8f5
tree3902bfb432609c37ab49183a30a826848f1367b5
parentb029d5c90af76fc5223f8296f8a5c1e9074222ad
parent382cf5cebac5b151a16eeaa2750b94766dca5024
Merge branch 'master' of eevee@tekkanin.veekun.com:dev/pokedex