Merge remote-tracking branch 'origin/master' into medvedev/oc-11785
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Mon, 4 Apr 2016 11:53:00 +0000 (14:53 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Mon, 4 Apr 2016 11:53:00 +0000 (14:53 +0300)
commit2c381a3f7d9c6b3464a075b5813017d9541c39bb
treedea2d4088bf14c95423587c458112df075afd672
parenta28da6b2a16a181d4ff12750bf1fd25d871f0f8a
parentd96168641137c8a9d1ebcf733d373c2da5d712b7
Merge remote-tracking branch 'origin/master' into medvedev/oc-11785