From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Wed, 31 Aug 2016 18:16:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: appcode/163.3655~1^2~2
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=a9560be199f9af25e28f7f5de6a9750ab35df9ec

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

a9560be199f9af25e28f7f5de6a9750ab35df9ec