Merge branch '2015.11' into 2015.11-develop

author Philipp Schüle <p.schuele@metaways.de>

Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)

committer Philipp Schüle <p.schuele@metaways.de>

Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)
author Philipp Schüle <p.schuele@metaways.de>
Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)
committer Philipp Schüle <p.schuele@metaways.de>
Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)
diff --cc tests/tine20/Felamimail/Frontend/JsonTest.php
Simple merge
diff --cc tine20/Felamimail/js/sieve/RulesGridPanel.js
Simple merge
diff --cc tine20/Tinebase/Container.php
Simple merge
diff --cc tine20/Tinebase/Model/Filter/FilterGroup.php
Simple merge
author	Philipp Schüle <p.schuele@metaways.de>
	Wed, 26 Oct 2016 12:46:32 +0000 (14:46 +0200)
committer	Philipp 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	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Felamimail/js/sieve/RulesGridPanel.js	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Tinebase/Container.php	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Tinebase/Model/Filter/FilterGroup.php	patch \|	diff1 \|	diff2 \|	blob \| history