Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 20 Aug 2015 15:09:58 +0000 (17:09 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 20 Aug 2015 15:09:58 +0000 (17:09 +0200)
commitf7f167a776f13788baf4c411d845533cdbcc6e33
treec042e9f3f658707eafcf34aadb8384fb666fe10f
parentfdd231ebfd6287c70454c68f0a2e4901e9c0c7c1
parent1d8ec7b55946a48b4d5ea23f1ecff763e7f4e8a4
Merge remote-tracking branch 'origin/master'