From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 2 Sep 2016 10:37:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: pycharm/163.3778^0
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=2b7316131edce19362ced2cc06cf553120ab69a1;hp=--cc

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

2b7316131edce19362ced2cc06cf553120ab69a1