Merge remote-tracking branch 'upstream/master' into 23_retry_peers

2014-09-09 11:39:50 +01:00
commit f1f1553a78
@@ -436,3 +436,5 @@ More details on the inner workings of weave can be found in the
 Found a bug, want to suggest a feature, or have a question?
 [File an issue](https://github.com/zettio/weave/issues), or email us
 at weave@zett.io.
+
+Follow us on Twitter: [@weavenetwork](https://twitter.com/weavenetwork).