client: rearrange docker version output

Rearrange docker version output so that server output matches client
output

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)

api/client/commands.go

@@ -385,8 +385,8 @@ func (cli *DockerCli) CmdVersion(args ...string) error {
 	if apiVersion := remoteVersion.Get("ApiVersion"); apiVersion != "" {
 		fmt.Fprintf(cli.out, "Server API version: %s\n", apiVersion)
 	}
-	fmt.Fprintf(cli.out, "Git commit (server): %s\n", remoteVersion.Get("GitCommit"))
 	fmt.Fprintf(cli.out, "Go version (server): %s\n", remoteVersion.Get("GoVersion"))
+	fmt.Fprintf(cli.out, "Git commit (server): %s\n", remoteVersion.Get("GitCommit"))
 	release := utils.GetReleaseVersion()
 	if release != "" {
 		fmt.Fprintf(cli.out, "Last stable version: %s", release)

integration-cli/docker_cli_version_test.go

@@ -24,8 +24,8 @@ func TestVersionEnsureSucceeds(t *testing.T) {
 		"Git commit (client):",
 		"Server version:",
 		"Server API version:",
-		"Git commit (server):",
 		"Go version (server):",
+		"Git commit (server):",
 		"Last stable version:",
 	}