5 Commits

Author	SHA1	Message	Date
Stephan	13ec3db2d3	fix 7.6-rc1 port	2017-05-24 12:25:59 +02:00
Stephan	8561d85f7a	porting 7.6-rc1 into 8	2017-05-24 12:25:39 +02:00
Stephan	c6e4e3b3ed	Merge origin/dev-v7-deploy into dev-v8-zbwip	2016-11-04 18:40:42 +01:00
Stephan	b29bc66026	Post-merge fixing & refactoring (tests ok)	2016-11-04 11:36:58 +01:00
Stephan	b26b415096	Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)	2016-11-03 10:31:44 +01:00