Merge branch 'master' of git@veekun.com:pokedex
authorZhorken <zhorken@gmail.com>
Sat, 24 Apr 2010 07:01:42 +0000 (03:01 -0400)
committerZhorken <zhorken@gmail.com>
Sat, 24 Apr 2010 07:01:42 +0000 (03:01 -0400)

Trivial merge