Merge branch 'master' of git@veekun.com:pokedex
authorEevee <git@veekun.com>
Mon, 6 Jul 2009 00:16:29 +0000 (17:16 -0700)
committerEevee <git@veekun.com>
Mon, 6 Jul 2009 00:16:29 +0000 (17:16 -0700)

Trivial merge