Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Dec 2016 13:42:15 +0000 (14:42 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Dec 2016 13:42:15 +0000 (14:42 +0100)
1  2 
tine20/Felamimail/Backend/Folder.php
tine20/Felamimail/Model/MessageFilter.php
tine20/Tinebase/WebDav/Collection/AbstractContainerTree.php

Simple merge