Merge branch 'master' into bump_v0.11.1

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-05-07 17:27:57 -07:00
commit 75fcb35695

Diff content is not available