Merge branch 'master' into pycharm/docker
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 7 Oct 2015 21:32:06 +0000 (23:32 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 7 Oct 2015 21:32:06 +0000 (23:32 +0200)
commita669f1e9522961ee89c3295ced44078f93a359af
tree05acf4074024d3898907c450b607853b8f3b943c
parentf59920fbeaea1b5f40ca697ee0bcaec83a34fb87
parent1611901ef6b17ac70bd24b10ccc2058c4e167fe6
Merge branch 'master' into pycharm/docker