Merge remote-tracking branch 'upstream/master'

Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
This commit is contained in:
Rohit Jnagal 2014-08-09 23:05:18 +00:00
commit cb8f471155

Diff Content Not Available