Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 16 Dec 2013 13:22:15 +0000 (14:22 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 16 Dec 2013 13:22:15 +0000 (14:22 +0100)
commit780c7f3b9a25f0c306268934e9ed0fd847f9c768
tree1375240261f0e63197f5a77c13fa2e894aa40e2f
parentfe137e00250cbce168d91866549057cd27950e6b
parentc8d08fe9e07017b3fb130868901c78455b1072bd
Merge branch '2013.03' into 2013.10

Conflicts:
tests/tine20/ActiveSync/Controller/ContactsTests.php
tests/tine20/ActiveSync/Controller/ContactsTests.php
tests/tine20/ActiveSync/TestCase.php
tine20/ActiveSync/Controller/Abstract.php
tine20/ActiveSync/Controller/Contacts.php
tine20/Felamimail/Controller/Cache/Message.php