Merge pull request #4687 from zqhxuyuan/patch-1

Update epel.rpm's new url
Fix external link on security of containers

Docker-DCO-1.1-Signed-off-by: Vladimir Rutsky <altsysrq@gmail.com> (github: rutsky)
In `docker ps`, sort by port instead of unsorted.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org> (github: erikh)
Fix `docker cp` trying to untar files that do not exist.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org> (github: erikh)
Merge pull request #4698 from rutsky/external_link_in_rst_fix

Fix external link on security of containers
Include instruction for AMI 2014.03

Include instructions to install Docker from Amazon's Software Repository on new AMI 2014.03 (Release Candidate)

Docker-DCO-1.1-Signed-off-by: Sebastien Stormacq <sebastien.stormacq@gmail.com> (github: sebsto)
Merge pull request #4672 from vieux/update_godoc_mflags

update godoc and add MAINTAINERS for mflags
fix content-type detection in docker cp

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Merge pull request #4686 from pnasrat/benchmark-typo

Fix spelling of benchmark test
Merge pull request #4700 from erikh/2371-sort_ports

In `docker ps`, sort by port instead of unsorted.
refactor(libcontainer): rename to CapabilitiesMask

The Capabilities field on libcontainer is actually used as a mask.
Rename the field so that this is more clear.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
chore(libcontainer): small grammar fix in types_test

Someone probably got really used to typing er on the end of contain :)

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Merge pull request #4719 from philips/Capabilities-to-CapabilitiesMask

refactor(libcontainer): rename to CapabilitiesMask
Update fedora.rst

It looks like ``wmdocker`` does not have an update for Fedora 20:

```
~❯ pkgwat releases wmdocker
Starting new HTTPS connection (1): apps.fedoraproject.org
+---------------+----------------+-----------------+
| release       | stable_version | testing_version |
+---------------+----------------+-----------------+
| Rawhide       | 1.5-12.fc21    | None            |
| Fedora 20     | None           | None            |
| Fedora 19     | None           | None            |
| Fedora EPEL 7 | None           | None            |
| Fedora EPEL 6 | None           | None            |
| Fedora EPEL 5 | None           | None            |
+---------------+----------------+-----------------+
```

I'm not sure if the owner awjb is intending to create an F20 update or
not, but either way -- these docs are incorrect as currently written.

Docker-DCO-1.1-Signed-off-by: Ralph Bean <rbean@redhat.com> (github: ralphbean)
Merge pull request #4720 from vieux/fix_content-type_cp

fix content-type detection in docker cp
Merge pull request #4645 from crosbymichael/add-logger

Add logger to libcontainer
display command display in docker ps

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

move git clone from daemon to client
Merge pull request #4701 from erikh/4099-non_existent_file_no_error

Fix `docker cp` trying to untar files that do not exist.
Move networking drivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)