Roman Roelofsen dff7cc65d1 Merge remote branch 'akollegger/master' into osgi ... Conflicts: project/build/AkkaProject.scala project/plugins/Plugins.scala		2010-06-18 11:20:10 +02:00
..
Plugins.scala	Merge remote branch 'akollegger/master' into osgi	2010-06-18 11:20:10 +02:00