Merge branch 'Unity-Technologies-upstreaming/emscripten'
authorIvan Maidanski <ivmai@mail.ru>
Sun, 13 Jul 2014 08:40:52 +0000 (12:40 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Sun, 13 Jul 2014 08:40:52 +0000 (12:40 +0400)

Trivial merge