From: Eevee <git@veekun.com>
Date: Mon, 11 Apr 2011 01:22:05 +0000 (-0700)
Subject: Merge branch '247-item-rewrite'
X-Git-Tag: veekun-promotions/2011041101
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/2984ee6a0c73836d08d0fe3b254efc8908e3531f?hp=-c

Merge branch '247-item-rewrite'
---

43d857b9ea43ccee6ec41c2ddbd79c8bef40cb3d