Merged master

This commit is contained in:
Solomon Hykes
2013-03-12 21:53:34 -07:00
+2 -2
View File
@@ -1,8 +1,8 @@
package client
import (
"../future"
"../rcli"
"github.com/dotcloud/docker/future"
"github.com/dotcloud/docker/rcli"
"io"
"log"
"os"