Merge remote-tracking branch 'origin/master' phpstorm/144.1096 pycharm/144.1097
authorYann Cébron <yann.cebron@jetbrains.com>
Sat, 14 Nov 2015 06:40:11 +0000 (07:40 +0100)
committerYann Cébron <yann.cebron@jetbrains.com>
Sat, 14 Nov 2015 06:40:11 +0000 (07:40 +0100)

Trivial merge