Merge remote-tracking branch 'origin/master'
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Wed, 14 Jan 2015 17:59:03 +0000 (20:59 +0300)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Wed, 14 Jan 2015 17:59:03 +0000 (20:59 +0300)
commit942f7da73d95f98071b15e954f709c365fe481c3
treeedcd075eddb8cdc46383a003f9c08ec68602e6c0
parentd16bae02a6a4db587091f871a1c311a9ac6ddbe9
parent06a21fcd941ce4a182a86748fb9a6eb323b6b431
Merge remote-tracking branch 'origin/master'