From 04748a77664c89340b789ef0a25d65b78477dce0 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Wed, 15 May 2013 15:51:04 -0400
Subject: [PATCH 1/4] Fix logic flaw in builder.mergeConfig

---
 builder.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder.go b/builder.go
index 5c51d62b9e..85447b5131 100644
--- a/builder.go
+++ b/builder.go
@@ -45,7 +45,7 @@ func (builder *Builder) mergeConfig(userConf, imageConf *Config) {
 		userConf.PortSpecs = imageConf.PortSpecs
 	}
 	if !userConf.Tty {
-		userConf.Tty = userConf.Tty
+		userConf.Tty = imageConf.Tty
 	}
 	if !userConf.OpenStdin {
 		userConf.OpenStdin = imageConf.OpenStdin

From 52ef89f9c20d02ca341c979e3d4cb8bd13aa0146 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Wed, 15 May 2013 15:52:19 -0400
Subject: [PATCH 2/4] Fix mistaken call to fmt.Println

---
 api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api.go b/api.go
index 8df3291357..86883cdc7d 100644
--- a/api.go
+++ b/api.go
@@ -363,7 +363,7 @@ func postBuild(srv *Server, w http.ResponseWriter, r *http.Request, vars map[str
 	defer in.Close()
 	fmt.Fprintf(out, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")
 	if err := srv.ImageCreateFromFile(in, out); err != nil {
-		fmt.Fprintln(out, "Error: %s\n", err)
+		fmt.Fprintf(out, "Error: %s\n", err)
 	}
 	return nil
 }

From 3a339b2bb3b06a110ccf93146cf020279705df84 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Wed, 15 May 2013 15:56:53 -0400
Subject: [PATCH 3/4] Update AUTHORS

---
 .mailmap |  4 +++-
 AUTHORS  | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 83c18fa29c..1f38e55e28 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,7 +2,7 @@
 <charles.hooper@dotcloud.com> <chooper@plumata.com> 
 <daniel.mizyrycki@dotcloud.com> <daniel@dotcloud.com>
 <daniel.mizyrycki@dotcloud.com> <mzdaniel@glidelink.net>
-Guillaume J. Charmes <guillaume.charmes@dotcloud.com> creack <charmes.guillaume@gmail.com>
+Guillaume J. Charmes <guillaume.charmes@dotcloud.com> <charmes.guillaume@gmail.com>
 <guillaume.charmes@dotcloud.com> <guillaume@dotcloud.com>
 <kencochrane@gmail.com> <KenCochrane@gmail.com>
 <sridharr@activestate.com> <github@srid.name>
@@ -16,4 +16,6 @@ Tim Terhorst <mynamewastaken+git@gmail.com>
 Andy Smith <github@anarkystic.com>
 <kalessin@kalessin.fr> <louis@dotcloud.com>
 <victor.vieux@dotcloud.com> <victor@dotcloud.com>
+<victor.vieux@dotcloud.com> <dev@vvieux.com>
 <dominik@honnef.co> <dominikh@fork-bomb.org>
+Thatcher Peskens <thatcher@dotcloud.com>
diff --git a/AUTHORS b/AUTHORS
index e8979aac6b..e7c6834cf4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,24 +1,34 @@
+Al Tobey <al@ooyala.com>
+Alexey Shamrin <shamrin@gmail.com>
 Andrea Luzzardi <aluzzardi@gmail.com>
 Andy Rothfusz <github@metaliveblog.com>
 Andy Smith <github@anarkystic.com>
 Antony Messerli <amesserl@rackspace.com>
+Barry Allard <barry.allard@gmail.com>
+Brandon Liu <bdon@bdon.org>
 Brian McCallister <brianm@skife.org>
+Bruno Bigras <bigras.bruno@gmail.com>
 Caleb Spare <cespare@gmail.com>
 Charles Hooper <charles.hooper@dotcloud.com>
 Daniel Mizyrycki <daniel.mizyrycki@dotcloud.com>
 Daniel Robinson <gottagetmac@gmail.com>
+Daniel Von Fange <daniel@leancoder.com>
 Dominik Honnef <dominik@honnef.co>
 Don Spaulding <donspauldingii@gmail.com>
+Dr Nic Williams <drnicwilliams@gmail.com>
+Evan Wies <evan@neomantra.net>
 ezbercih <cem.ezberci@gmail.com>
 Flavio Castelli <fcastelli@suse.com>
 Francisco Souza <f@souza.cc>
 Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
 Guillaume J. Charmes <guillaume.charmes@dotcloud.com>
+Harley Laue <losinggeneration@gmail.com>
 Hunter Blanks <hunter@twilio.com>
 Jeff Lindsay <progrium@gmail.com>
 Jeremy Grosser <jeremy@synack.me>
 Joffrey F <joffrey@dotcloud.com>
 John Costa <john.costa@gmail.com>
+Jonas Pfenniger <jonas@pfenniger.name>
 Jonathan Rudenberg <jonathan@titanous.com>
 Julien Barbier <write0@gmail.com>
 Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>
@@ -27,8 +37,11 @@ Kevin J. Lynagh <kevin@keminglabs.com>
 Louis Opter <kalessin@kalessin.fr>
 Maxim Treskin <zerthurd@gmail.com>
 Mikhail Sobolev <mss@mawhrin.net>
+Nate Jones <nate@endot.org>
 Nelson Chen <crazysim@gmail.com>
 Niall O'Higgins <niallo@unworkable.org>
+odk- <github@odkurzacz.org>
+Paul Bowsher <pbowsher@globalpersonals.co.uk>
 Paul Hammond <paul@paulhammond.org>
 Piotr Bogdan <ppbogdan@gmail.com>
 Robert Obryk <robryk@gmail.com>
@@ -38,6 +51,8 @@ Silas Sewell <silas@sewell.org>
 Solomon Hykes <solomon@dotcloud.com>
 Sridhar Ratnakumar <sridharr@activestate.com>
 Thatcher Peskens <thatcher@dotcloud.com>
+Thomas Bikeev <thomas.bikeev@mac.com>
+Tianon Gravi <admwiggin@gmail.com>
 Tim Terhorst <mynamewastaken+git@gmail.com>
 Troy Howard <thoward37@gmail.com>
 unclejack <unclejacksons@gmail.com>

From aa0d40747caa8cd9c5cee56046cac011bc3d1065 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Wed, 15 May 2013 16:02:24 -0400
Subject: [PATCH 4/4] Remove broken, redundant struct tag

---
 auth/auth.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth/auth.go b/auth/auth.go
index 5a5987ace8..9836a20978 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -21,7 +21,7 @@ type AuthConfig struct {
 	Username string `json:"username"`
 	Password string `json:"password"`
 	Email    string `json:"email"`
-	rootPath string `json:-`
+	rootPath string
 }
 
 func NewAuthConfig(username, password, email, rootPath string) *AuthConfig {