Patrik Nordwall 8ab02738b7 Merge branch 'master' into wip-sync-artery-dev-2.4.9-patriknw		2016-08-23 20:14:15 +02:00
..
main	=htc, doc replace usages of deprecated methods of FileIO (#20928)	2016-07-10 17:41:57 +02:00
multi-jvm/scala/akka/cluster/ddata	Merge branch 'master' into wip-sync-artery-dev-2.4.9-patriknw	2016-08-23 20:14:15 +02:00
test	A simpler ActorRefProvider config #20649 (#20767)	2016-06-10 15:04:13 +02:00