tree bba5fdc1f3b2de1d6b0d60b07b36c46d1c10fb2e
parent eace2dbe1d49ad6a990f5b42f092d3f4d77bf225
parent 7cf60da38880534d76d031c4646fbd469d922385
author Michael Crosby <crosby.michael@gmail.com> 1384467253 -0800
committer Michael Crosby <crosby.michael@gmail.com> 1384467253 -0800

Merge pull request #31 from shykes/shykes-0.6.5-dm-plugin

Merge from dotcloud/docker master