Zarel/Pokemon-Showdown — pull request #1204 by N19 (2014-09-11 11:45:40+00:00)
Title: Merge pull request #1 from Zarel/master

Merge