Merge remote-tracking branch 'origin/pycharm/folding' into pycharm/folding
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Fri, 27 Nov 2015 10:37:22 +0000 (13:37 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Fri, 27 Nov 2015 10:37:22 +0000 (13:37 +0300)
commit905a4b9aa2c1e291c99193008c0a19d4463ba220
tree57e58c2ea694de2bea6af825b31ec7e1c23673fe
parent18882cdf4ebaa3c429186f17d01533d9aa4e38d0
parent5a872f9dc465fb396455906ac6caecc68ee2cc0e
Merge remote-tracking branch 'origin/pycharm/folding' into pycharm/folding