Merge remote-tracking branch 'origin/encounters-i18n'
authorEevee <git@veekun.com>
Wed, 6 Apr 2011 05:32:51 +0000 (22:32 -0700)
committerEevee <git@veekun.com>
Wed, 6 Apr 2011 05:32:51 +0000 (22:32 -0700)
commit00e0bf75c998b9d9c743d383f1596c91f9a03766
treed1333fa761edb7a1834a62dd592931a4a4880aa3
parent517e947f5ab92e233677f95286af9feabeb68fbc
parent80c230540ce01e905bcb3aae86b73806884e5f92
Merge remote-tracking branch 'origin/encounters-i18n'

Conflicts:
pokedex/db/__init__.py
pokedex/db/__init__.py
pokedex/db/markdown.py
pokedex/db/tables.py