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)
1  2 
pokedex/data/csv/item_flag_map.csv

Simple merge