Derek Williams 846d63aa92 Merge branch 'master' into delimited-continuations ... Conflicts: akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala akka-actor/src/main/scala/akka/dispatch/Future.scala project/build/AkkaProject.scala		2011-04-30 08:59:45 -06:00
..
main/scala/akka/testkit	Fixing ticket 808	2011-04-29 17:15:00 +02:00
test/scala/akka/testkit	Merge branch 'master' into delimited-continuations	2011-04-30 08:59:45 -06:00