Fix 2585 and clean up warning in contributing.rst
fix Assign id as name when all else fails
go fmt
Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails

Fix Assign id as name when all else fails
Internal cleanup: use the mounted container filesystem instead of manipulating the aufs layers directly
Fix a crash in graphdriver init
Merge pull request #2589 from dotcloud/gofmt

Go fmt
archive.ApplyLayer() remove files recursively

Some aufs metadata are directories, and whiteouts can be for
directories, so use os.RemoveAll() for these.
- Fix the attach examples according to the new attach behavior
- Add the option of adding the user to docker's group and avoid the usage of "sudo" before each command
network: add iptables rules to explicitly allow forwarding

Explicitly enable container networking for Fedora and other distros that
have a REJECT all rule at the end of their FORWARD table.
fix mergeConfig with new ports
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
devmapper: port to the new driver API and reactivate driver
- Included the sudo alternative as an example_header
Merge branch 'master' into 0.6.5-dm-plugin

Conflicts:
	container.go
	runtime.go
Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user
Merge pull request #2348 from SvenDowideit/2328-docker-events-since-date-string

Use string timestamp for docker events -since
gofmt
Move Change to the archive package, and fix a leftover merge in
Container.Inject()
Move Change to the archive package