tree fcea85f699a3563018880e16e82e62e29e0a3297
parent e128a606e39fa63c6b4fd6e53a1d88cf00aad868
parent 41b2874b99fa308b23bd9984b28f2c89f69ebd14
author Michael Crosby <michael@crosbymichael.com> 1399424603 -0700
committer Michael Crosby <michael@crosbymichael.com> 1399424603 -0700

Merge branch 'master' into bump_v0.11.0

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)