Merged master

This commit is contained in:
Solomon Hykes 2013-03-12 21:53:34 -07:00
commit a790f96feb
1 changed files with 2 additions and 2 deletions

View File

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