From d92166cc7937afa39e2ed537c601555a0a5b84eb Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Sat, 4 May 2013 20:58:45 -0700
Subject: [PATCH] Fix merge issue

---
 commands.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/commands.go b/commands.go
index d9756c9d88..442d7f55ee 100644
--- a/commands.go
+++ b/commands.go
@@ -10,6 +10,7 @@ import (
 	"log"
 	"net/http"
 	"net/url"
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"