From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 7 Oct 2016 10:28:00 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: dbe/163.5901~5
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=640fdc8c433525238d1bf16448927120657e055c;hp=-c

Merge remote-tracking branch 'origin/master'
---

640fdc8c433525238d1bf16448927120657e055c