From: Eevee <git@veekun.com>
Date: Wed, 6 Apr 2011 05:32:51 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/encounters-i18n'
X-Git-Tag: veekun-promotions/2011041101~6
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/00e0bf75c998b9d9c743d383f1596c91f9a03766?hp=00e0bf75c998b9d9c743d383f1596c91f9a03766

Merge remote-tracking branch 'origin/encounters-i18n'

Conflicts:
	pokedex/db/__init__.py
---