Merge branch 'master' of git://veekun.com/pokedex
authorZhorken <zhorken@gmail.com>
Sun, 20 Dec 2009 21:08:47 +0000 (16:08 -0500)
committerZhorken <zhorken@gmail.com>
Sun, 20 Dec 2009 21:08:47 +0000 (16:08 -0500)

Trivial merge