Merge branch 'master' into wip-derekjw

Conflicts: akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
2011-07-15 11:31:24 -06:00 · 2011-07-15 11:31:24 -06:00 · 50dcdd411c
commit 50dcdd411c
parent dba8749f1d 0e933d2442
253 changed files with 1465 additions and 660 deletions
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
 */

 package akka.dispatch