Merge branch 'master' into wip-2006-binary-compat-√

2012-05-21 20:21:27 +02:00 · 2012-05-21 20:21:27 +02:00 · fad9470005
commit fad9470005
parent 64cda1f3e7 22692eb95d
14 changed files with 45 additions and 21 deletions
--- a/akka-docs/scala/code/akka/docs/io/HTTPServer.scala
+++ b/akka-docs/scala/code/akka/docs/io/HTTPServer.scala
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
 */
 package akka.docs.io