Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx
Merge pull request #5596 from dotcloud/contrib-fix

Post-commit hook URL fix
Merge pull request #5538 from shykes/pr_out_engine_catchall_handler_is_shadowed_by_specific_handlers
Merge pull request #5575 from vieux/pr-5428
Merge pull request #5602 from crosbymichael/libcontainer-enable

Improve libcontainer namespace and cap format
Merge pull request #4441 from crosbymichael/add-net-flag

Add --net flag to docker run and allow host network stack
Update after namespace refactor
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #5608 from crosbymichael/net-flag-refactor

HOTFIX Update after namespace refactor
Move envconfig generation to lxc driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #5600 from unclejack/sha512_registry_support

import sha512 to make sha512 ssl certs work
add etchosts

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
add resolvconf

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Merge pull request #5611 from vieux/networkfs_pkgs

add 2 networkfs pkgs
Merge pull request #5609 from crosbymichael/move-env-gen
Merge pull request #5597 from jamtur01/docs-simplify-osx-install

Fixed the horrible OSX installation docs
Merge pull request #5354 from alexlarsson/cgroups-systemd-fixes

cgroups: Update systemd to match fs backend
propagate errors write

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Merge pull request #5613 from vieux/better_error_handling

propagate errors write
Move Attach from container to daemon

This moves the Attach method from the container to the daemon.  This
method mostly supports the http attach logic and does not have anything
to do with the running of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #5614 from crosbymichael/move-attach-to-daemon

Move Attach from container to daemon