Patrik Nordwall e456213e31 Merge branch 'master' into wip-1503-remove-stm-patriknw ... Conflicts: akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala akka-docs/modules/camel.rst		2011-12-14 18:56:39 +01:00
..
akka/docs	DOC: Rewrite config comments. See #1505	2011-12-14 15:12:40 +01:00
ActorDocSpec.scala	Enormous merge with master which probably led to the indirect unfortunate deaths of several kittens	2011-12-14 17:36:39 +01:00
UnnestedReceives.scala	Updated documentation of Actors Scala. See #1435	2011-12-07 11:56:58 +01:00