Patrik Nordwall 09e13e271b Merge branch 'master' into wip-1310-err2-patriknw ... Conflicts: akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala akka-cluster/src/main/scala/akka/cluster/Cluster.scala akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala		2012-02-03 13:57:28 +01:00
..
main	Merge branch 'master' into wip-1310-err2-patriknw	2012-02-03 13:57:28 +01:00
test	Not a running junit test, only verifies compilation	2012-02-01 11:53:46 +01:00