Merge branch 'master' of git://veekun.com/pokedex
authorZhorken <zhorken@gmail.com>
Sun, 31 Jan 2010 19:10:14 +0000 (14:10 -0500)
committerZhorken <zhorken@gmail.com>
Sun, 31 Jan 2010 19:10:14 +0000 (14:10 -0500)
commit73e43966dceb7a1dcc806735991d226ac5123801
tree288e3b13e65a629c7dac3b50821ffe7d925225c5
parentade0f1d39a23d644fc494cd531f292e6e9586ab2
parentc4c404f3d8ccf4de5b4e5a8f7ad936e2c6da5dea
Merge branch 'master' of git://veekun.com/pokedex