Christian Amend 366597070f Merge branch 'master' into olingo640
Conflicts:
	fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java
	lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
2015-08-04 14:38:01 +02:00
..
2015-08-04 14:38:01 +02:00
2015-07-24 09:29:13 +02:00