Jonas Bonér 30efc7e125 Merge branch 'master' of git@github.com:jboner/akka ... Conflicts: config/akka-reference.conf		2010-07-18 07:30:19 +02:00
..
src	Merge branch 'master' of git@github.com:jboner/akka	2010-07-18 07:30:19 +02:00
.ensime	Adding Ensime project file	2010-07-11 12:14:43 +02:00