Zarel/Pokemon-Showdown — pull request #1124 by Morfent (2014-08-06 22:31:33+00:00)
Title: Only merge files ending in .js from ./chat-plugins/

e.g. ViM swap files during testing