From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 13 Jul 2014 08:40:52 +0000 (+0400)
Subject: Merge branch 'Unity-Technologies-upstreaming/emscripten'
X-Git-Tag: gc7_6_0~218
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6f4d1563b27af7e05ffe9ed676aff448b38c40e;p=gc

Merge branch 'Unity-Technologies-upstreaming/emscripten'
---

f6f4d1563b27af7e05ffe9ed676aff448b38c40e