Merge branch 'master' into 1063-docs-routing-he

Conflicts:
	akka-docs/java/routing.rst
	akka-docs/scala/routing.rst
This commit is contained in:
Henrik Engstrom 2011-12-15 20:15:32 +01:00
commit 26d49fecb9
57 changed files with 1633 additions and 877 deletions

View file

@ -1,6 +1,3 @@
.. _routing-java:
Routing (Java)
==============