From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 14 Jun 2016 08:05:03 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: clion/163.204~2
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=7918f31f06e72c438209dc5100ed5fbc95c2aab5

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

7918f31f06e72c438209dc5100ed5fbc95c2aab5