Merge with upstream/master

urche0n-82 · urche0n-82 · commit bc38926e0def · 2014-09-15T19:07:15.000-06:00
Former-commit-id: c7044c0f07312eaf2ede2e25b936e20565317de8 [formerly 644fc057b0ac1ce81bf332ae30c9162290d9891c]
Former-commit-id: 3155ab3c6fde0ad797c123e760a4ff88aa8dc493
diff --git a/main.go.REMOVED.git-id b/main.go.REMOVED.git-id
@@ -1 +1 @@
-f247ca401175667cbe44c1fc8dad5be3c66d7487
+6c090d2eae26e3f9c9ef142a61f47ff9dc97b750

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f247ca401175667cbe44c1fc8dad5be3c66d7487`
	`1`	`+6c090d2eae26e3f9c9ef142a61f47ff9dc97b750`