post-merge repairs

Upstream-commit: b4b078c5ae
Component: cli
This commit is contained in:
shin-
2013-03-11 07:39:06 -07:00
parent 74886786d3
commit 82b549063d

View File

@ -1,8 +1,8 @@
package client
import (
"github.com/dotcloud/docker/future"
"github.com/dotcloud/docker/rcli"
"../future"
"../rcli"
"io"
"io/ioutil"
"log"