Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 12 Mar 2013 13:36:00 +0000 (14:36 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 12 Mar 2013 13:36:00 +0000 (14:36 +0100)
commit6a87c88e65b7ba05f79619cde431c576144c630b
tree00600eebd6df27feb206c1e8ef7573bff287fa3a
parent3f40e1a2efcced215a364ff5cbc282c612c68f10
parentc0a662edc3bd65474c5160fb9ab2ab91fb79d6fc
Merge branch 'tine20.com/2012.10' into 2013.03

Conflicts:
tine20/ActiveSync/Setup/Update/Release6.php
tine20/ActiveSync/Setup/setup.xml
tests/tine20/Felamimail/Controller/MessageTest.php
tine20/ActiveSync/Setup/Update/Release6.php
tine20/ActiveSync/Setup/Update/Release7.php
tine20/ActiveSync/Setup/setup.xml
tine20/Felamimail/js/GridPanel.js
tine20/Felamimail/js/Model.js
tine20/Tinebase/Config.php