Jonas Bonér be32e80985 Merge branch 'master' of git@github.com:jboner/akka ... Conflicts: akka-actor/src/main/resources/logback.xml akka-actor/src/main/scala/dataflow/DataFlowVariable.scala akka-actor/src/test/scala/dataflow/DataFlowSpec.scala akka-remote/src/main/scala/remote/RemoteClient.scala akka-remote/src/test/resources/logback-test.xml		2010-08-29 18:17:36 +02:00
..
AkkaProject.scala	Merge branch 'master' of git@github.com:jboner/akka	2010-08-29 18:17:36 +02:00