Merge branch 'encukou'
authorEevee <git@veekun.com>
Wed, 6 Apr 2011 04:04:32 +0000 (21:04 -0700)
committerEevee <git@veekun.com>
Wed, 6 Apr 2011 04:04:32 +0000 (21:04 -0700)
commita04865183fefdd58b0de1cea7c69a9b04a408e53
treeb94ee99d15f2999e9d94e8d1873920d4df4056a9
parent2c94dcb72535499c43958ceb9d1ca6af25740995
parent20b21d990ddf15995d05c64f6f354db0bad33b88
Merge branch 'encukou'
pokedex/db/multilang.py