Merge pull request #7899 from Saerith/fix/7085

Changed basic-javascript function names to be unique
This commit is contained in:
Rex Schrader
2016-04-06 12:45:17 -07:00