Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 19 Oct 2016 17:28:52 +0000 (19:28 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 19 Oct 2016 17:28:52 +0000 (19:28 +0200)
commit3f3bd45de151713f883f06433d65cfde899aad2a
treef71c2b7f27b2df9e7a57da62d31191b3376d2d62
parent3314382d6e2fd7cf2d6baa3eb0f5f4dd8615c8f0
parent1831c5332007636ab6341c86c1d217bb0ea774f3
Merge remote-tracking branch 'origin/master'