docker-vs-vagrant-question-mark
Merge pull request #18 from MikeLing/master

docker-vs-vagrant-question-mark
Merge pull request #19 from googollee/master

supervisor-with-docker-to-manage-processes
docker-vs-lxc-and-ansible.md
Merge pull request #20 from regrecall/master

docker-vs-lxc-and-ansible.md
Merge pull request #22 from googollee/master

fix some typo
Create How to Deploy Douban CODE in Ubuntu and Docker
Rename How to Deploy Douban CODE in Ubuntu and Docker to how-to-deploy-douban-code-in-ubuntu-and-docker
Rename how-to-deploy-douban-code-in-ubuntu-and-docker to how-to-deploy-douban-code-in-ubuntu-and-docker.md
Add the translation of the reset sections.
Update docker-vs-lxc-and-ansible.md
Update docker-vs-lxc-and-ansible.md
Merge #23 by hand.
Update using-nginx-confd-and-docker-for-zero-downtime-web-updates.md
Update docker-and-ipv6-on-ubuntu-13-10.md
docker 0.10