Merge branch 'master' into wip-1581-patterns-ask

2012-01-20 19:29:17 +01:00 · 2012-01-20 19:29:17 +01:00 · 34a0f005b1
commit 34a0f005b1
parent 1f99b425de f4587322be
306 changed files with 1384 additions and 731 deletions
--- a/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java
+++ b/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java
@ -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.actor;