From: Dmitry Trofimov Date: Tue, 29 Sep 2015 16:53:57 +0000 (+0200) Subject: Merge remote-tracking branch 'remotes/origin/master' into pycharm/docker X-Git-Tag: pycharm/144.116~9 X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=73949087ffaf7ce1d3abf8a8f64e1d66403b4157 Merge remote-tracking branch 'remotes/origin/master' into pycharm/docker --- 73949087ffaf7ce1d3abf8a8f64e1d66403b4157