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 16:27:53 +0000 (18:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 16:27:53 +0000 (18:27 +0200)
commitc2ff355aa1653beef2cdef9c3e2b0380562f7d83
tree6cc24137892f3294c9686c0a29326dbadb71d395
parentf4f87a2706c4ae68f36be931f6bdaeecbe73acfc
parentdd856e7ce30d5b030aa73570e9fcac6653c58036
Merge branch '2016.03' of https://gerrit.tine20.org/tine20/p/tine20 into 2016.03