Merge remote-tracking branch 'upstream/master'

urche0n-82 · urche0n-82 · commit a6b70122c7bf · 2014-08-31T21:53:54.000-06:00
Merged upstream changes for v1.7 final


Former-commit-id: a43dda4c73c417090c121970c449a586eef4624f [formerly 4588fd5ea8532bf7bb58d884eb72fa3840038711]
Former-commit-id: 91ec01225e13d29db48b7afafab455255837458c
diff --git a/README.md.REMOVED.git-id b/README.md.REMOVED.git-id
@@ -1 +1 @@
-642da7687056eba0d95bf55d3321fec2bc069bc0
+746d475cce09e8d8b0708abe764800a4599e838d
diff --git a/main.go.REMOVED.git-id b/main.go.REMOVED.git-id
@@ -1 +1 @@
-f6ac111d794b21743dab1bf5371790b1be639d99
+f247ca401175667cbe44c1fc8dad5be3c66d7487
diff --git a/serial.go.REMOVED.git-id b/serial.go.REMOVED.git-id
@@ -1 +1 @@
-be6abdc2e1bb47d9a1c05c8c9136a8a3d1c2cfb7
+91cf53b02466d3d799fd4c94e7b8bdcb81936861
diff --git a/snapshot/README.md.REMOVED.git-id b/snapshot/README.md.REMOVED.git-id
@@ -1 +1 @@
-52433dd33663222c460874e3718b4341a006e10d
+746d475cce09e8d8b0708abe764800a4599e838d
diff --git a/snapshot/serial-port-json-server_linux_386.tar.gz.REMOVED.git-id b/snapshot/serial-port-json-server_linux_386.tar.gz.REMOVED.git-id
@@ -1 +1 @@
-844b5e06cc69bdbe8fe83b4d379b3a9665accf24
+a37f8b16075805b5c560375d40f72fb9092b4b5b
diff --git a/snapshot/serial-port-json-server_linux_amd64.tar.gz.REMOVED.git-id b/snapshot/serial-port-json-server_linux_amd64.tar.gz.REMOVED.git-id
@@ -1 +1 @@
-02a2751d850dbb960a25289ee07ba614bb13d0d7
+2303a4e25328d431142618261cec928423d79d6a
diff --git a/snapshot/serial-port-json-server_linux_arm.tar.gz.REMOVED.git-id b/snapshot/serial-port-json-server_linux_arm.tar.gz.REMOVED.git-id
@@ -1 +1 @@
-fd8855c49a7fb79560c7a092a433e7087b0aef7f
+92e1bf8aa7e9baab67f34ca6207f32277bad9b1a
diff --git a/snapshot/serial-port-json-server_snapshot_amd64.deb.REMOVED.git-id b/snapshot/serial-port-json-server_snapshot_amd64.deb.REMOVED.git-id
@@ -1 +1 @@
-b5ab226ef28cf7583d4b3dc1e443bb7cc333bf29
+78fc8f49b5a5bac2d74714eb078378f8ef729e40
diff --git a/snapshot/serial-port-json-server_snapshot_armhf.deb.REMOVED.git-id b/snapshot/serial-port-json-server_snapshot_armhf.deb.REMOVED.git-id
@@ -1 +1 @@
-ca4ca883549f58ca369ce8f7e2f7ac82941d878f
+8cc567554785fefa97326e6d268a04412e0ea6e6
diff --git a/snapshot/serial-port-json-server_snapshot_i386.deb.REMOVED.git-id b/snapshot/serial-port-json-server_snapshot_i386.deb.REMOVED.git-id
@@ -1 +1 @@
-a8466da033bfc053d303721b0c9ad9ea66be0882
+8814cb1921dff175fe664dfe46cda419115c8c72
diff --git a/snapshot/serial-port-json-server_windows_386.zip.REMOVED.git-id b/snapshot/serial-port-json-server_windows_386.zip.REMOVED.git-id
@@ -1 +1 @@
-22c764393bb7b4176e9d644ad7a4dbbce87a3595
+9ceb93bbab217e95e1f942c688f30a9eeeefeaa8
diff --git a/snapshot/serial-port-json-server_windows_amd64.zip.REMOVED.git-id b/snapshot/serial-port-json-server_windows_amd64.zip.REMOVED.git-id
@@ -1 +1 @@
-9668904c38d5fac571e4ddeef127ee1f5301da6b
+cc84b849dc0c228ccedabaca64e6947b87265eb2

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-642da7687056eba0d95bf55d3321fec2bc069bc0`
	`1`	`+746d475cce09e8d8b0708abe764800a4599e838d`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f6ac111d794b21743dab1bf5371790b1be639d99`
	`1`	`+f247ca401175667cbe44c1fc8dad5be3c66d7487`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-be6abdc2e1bb47d9a1c05c8c9136a8a3d1c2cfb7`
	`1`	`+91cf53b02466d3d799fd4c94e7b8bdcb81936861`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-52433dd33663222c460874e3718b4341a006e10d`
	`1`	`+746d475cce09e8d8b0708abe764800a4599e838d`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-844b5e06cc69bdbe8fe83b4d379b3a9665accf24`
	`1`	`+a37f8b16075805b5c560375d40f72fb9092b4b5b`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-02a2751d850dbb960a25289ee07ba614bb13d0d7`
	`1`	`+2303a4e25328d431142618261cec928423d79d6a`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-fd8855c49a7fb79560c7a092a433e7087b0aef7f`
	`1`	`+92e1bf8aa7e9baab67f34ca6207f32277bad9b1a`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b5ab226ef28cf7583d4b3dc1e443bb7cc333bf29`
	`1`	`+78fc8f49b5a5bac2d74714eb078378f8ef729e40`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ca4ca883549f58ca369ce8f7e2f7ac82941d878f`
	`1`	`+8cc567554785fefa97326e6d268a04412e0ea6e6`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-a8466da033bfc053d303721b0c9ad9ea66be0882`
	`1`	`+8814cb1921dff175fe664dfe46cda419115c8c72`