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)
1  2 
tine20/Tinebase/Import/Abstract.php
tine20/Tinebase/User.php

Simple merge
Simple merge