Patrik Nordwall 1914be7069 Merge branch 'master' into wip-2547-metrics-router-patriknw ... Conflicts: akka-actor/src/main/scala/akka/actor/Deployer.scala akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala		2012-11-15 12:33:11 +01:00
..
_sphinx	Repointing the link for the downloads.	2012-10-24 14:38:20 +02:00
rst	Merge branch 'master' into wip-2547-metrics-router-patriknw	2012-11-15 12:33:11 +01:00
.history	Tests are green with new Futures, consider this a half-way-there marker	2011-12-11 00:40:52 +01:00
Makefile	Add options for creating epub output for the documentation	2012-05-17 22:58:57 +02:00