Martin Krasser 564692cd42 Merge remote branch 'remotes/origin/master' into 458-krasserm and resolved conflict in akka-camel/src/main/scala/CamelService.scala		2010-10-29 11:04:48 +02:00
..
build	Merge remote branch 'remotes/origin/master' into 458-krasserm and resolved conflict in akka-camel/src/main/scala/CamelService.scala	2010-10-29 11:04:48 +02:00
plugins	removed codefellow plugin	2010-08-18 15:15:22 +02:00
build.properties	BREAKAGE: switching from se.scalablesolutions.akka to akka for all packages	2010-10-26 12:49:25 +02:00