Merge branch '2016.03' of https://gerrit.tine20.org/tine20/p/tine20 into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 15:20:06 +0000 (17:20 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 15:20:06 +0000 (17:20 +0200)
commitf12e7916494b76c3392311d99abd0c48fd0ffc48
tree760c4c0fc64ba43b38b8d1d220dd69b38f06380b
parentda0e98ec1ffd8819c83c222b2bbc61362f230419
parent38f012c51980774684f9f771af340cf8cb265929
Merge branch '2016.03' of https://gerrit.tine20.org/tine20/p/tine20 into 2016.03