Merge branch 'master' into test

Conflicts:
	java/target/configuration/config.ini
This commit is contained in:
Axel Uhl committed 2011-09-15 22:52:09 +02:00
commit 34924b0627
668 files changed
+102406 -665

No files matched your search

+1
View File
@@ -5,3 +5,4 @@ eclipse.ignoreApp=true
osgi.noShutdown=true
org.osgi.service.http.port=8887
mongo.port=10201
expedition.udp.port=2010