Merge remote branch 'veekun/media-reorganization'
authorPetr Viktorin <encukou@gmail.com>
Thu, 14 Apr 2011 10:37:54 +0000 (13:37 +0300)
committerPetr Viktorin <encukou@gmail.com>
Thu, 14 Apr 2011 10:37:54 +0000 (13:37 +0300)
commit81970e6c67c9bd670835f76bb32a357916ab6c5b
tree985d66e89f808916ce07322959855228a9fd4e86
parentae6e2afb5370c6c58d63738748ff2c9cc7edc724
parent0bcdda839aa3bd69a4f49504c89e5c79f4cf48e3
Merge remote branch 'veekun/media-reorganization'
pokedex/data/csv/item_flag_map.csv