Merge branch '2015.11-develop-postal' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 10 Jun 2016 16:18:29 +0000 (18:18 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 10 Jun 2016 16:18:29 +0000 (18:18 +0200)
commitb2f3339598103c6de94f6e186234c6ec5abdf4f3
treeb37d1e74c0ca0e0e518461970db0167ae4cc5dc3
parentc6b2d360f719d77c37595b897b1bb7061710f05d
parent82cae87d8162a240c5834374af8557da540371b3
Merge branch '2015.11-develop-postal' into 2015.11-develop