Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)
1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Felamimail/js/sieve/RulesGridPanel.js
tine20/Tinebase/Container.php
tine20/Tinebase/Model/Filter/FilterGroup.php

Simple merge