Christian Amend 55c4d69d8d Merge branch 'master' into batchrefactor ... Conflicts: lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java		2014-12-16 10:49:17 +01:00
..
src	Merge branch 'master' into batchrefactor	2014-12-16 10:49:17 +01:00
pom.xml	[OLINGO-342] Set development version to 4.0.0-beta-02-SNAPSHOT	2014-09-23 09:44:29 +02:00