Merge branch 'master' of git@veekun.com:pokedex
authorZhorken <zhorken@gmail.com>
Wed, 28 Apr 2010 07:59:04 +0000 (03:59 -0400)
committerZhorken <zhorken@gmail.com>
Wed, 28 Apr 2010 07:59:04 +0000 (03:59 -0400)

Trivial merge