Peter Vlugter eecb2a6247 Merge branch 'master' into java-api-for-scala-stm ... Conflicts: akka-transactor/src/main/scala/akka/transactor/Atomically.scala		2012-01-20 11:36:54 +13:00
..
main/scala	Merge branch 'master' into java-api-for-scala-stm	2012-01-20 11:36:54 +13:00
test	Merge branch 'master' into java-api-for-scala-stm	2012-01-20 11:36:54 +13:00