Merge with upstream/master

urche0n-82 · urche0n-82 · commit 450f3c18181f · 2014-09-15T19:07:37.000-06:00
Former-commit-id: 84c994d8a2eb4acdc27e902903fb48629b9ddccd [formerly ba89f19eb5f2f19233b8a18ba3fdeef676eb917b]
Former-commit-id: 335b51c2a21f1f0fec8e675fac4726aaa11348d0
diff --git a/serialport.go.REMOVED.git-id b/serialport.go.REMOVED.git-id
@@ -1 +1 @@
-cfe922d6c8feba064c06c48063ec782853e6f12c
+53f76fc02903e5da2c7a40b1f2c2a8d8200311e4

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-cfe922d6c8feba064c06c48063ec782853e6f12c`
	`1`	`+53f76fc02903e5da2c7a40b1f2c2a8d8200311e4`