Christian Amend 9f663baf5c Merge branch 'master' into olingo786
Conflicts:
	lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
2015-10-22 10:28:23 +02:00
..