Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Dec 2016 10:57:12 +0000 (11:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Dec 2016 10:57:12 +0000 (11:57 +0100)
commit9f2d44c6a20d65822acaad964468373a1d81fcd9
tree230f2697a9d2d854983c86c9954187fe5adb784f
parent54940265244af0c571671bf55a46fc1b1fa7462e
parent29e6f9f27b063e192a1bb80b3cdc02098af2f8db
Merge branch '2016.11' into 2016.11-develop
tine20/Tinebase/Import/Abstract.php
tine20/Tinebase/User.php