Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 26 Oct 2016 16:31:15 +0000 (18:31 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 26 Oct 2016 16:31:15 +0000 (18:31 +0200)
commit9b1224ef7d42fbea7c88b88b1cbf4e3e36c8256e
treec79c97e116f69e532a7f85af9d95a68768514e50
parent88017c34f72b4dc045f2eca606eccbdc034f98df
parentbd8b87f0036e950025a7922995ffe228da60f87a
Merge remote-tracking branch 'origin/master'