From: Eevee <git@veekun.com>
Date: Tue, 29 Mar 2011 02:14:24 +0000 (-0700)
Subject: Merge branch 'schema-sanity'
X-Git-Tag: veekun-promotions/2011041101~33
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/a884a8b9766982880862defa2a1d2736de1a46a6

Merge branch 'schema-sanity'
---

a884a8b9766982880862defa2a1d2736de1a46a6