Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:41:52 +0000 (10:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:41:52 +0000 (10:41 +0100)
commit9941612858a723cdb08f04f12b244010c78226c5
treed700f948df1fc6e042fe5e306a48233c16274da1
parent30059bb2e260e2f91ae3d9e4eafe1131cfe4b9f2
parent45753f8256e38967dc99c6ecdf2355fb6b91b9d0
Merge branch '2015.11-develop'

Conflicts:
tine20/Tinebase/js/tineInit.js

Change-Id: I568596034536cb7364da4dddad79d7924d177dcb
tine20/Setup/Controller.php
tine20/Tinebase/js/tineInit.js