Merge remote-tracking branch 'origin/pycharm/docker' into pycharm/docker
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 29 Sep 2015 19:24:29 +0000 (21:24 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 29 Sep 2015 19:24:29 +0000 (21:24 +0200)
commit4bdf775444cd8f84b6300a5374f5f08737d14c6b
tree3bbd63bf23f7a3194ec2c8a78ca53fa931151d1d
parent9875b571031d2be0c9fe5acd8b96a2e228a4a692
parent06ff4c7111670a266ef3f74e6d84eb6e4f04c8f0
Merge remote-tracking branch 'origin/pycharm/docker' into pycharm/docker