Merge branch 'master' of http://git.syncroton.org/Syncroton
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 5 Oct 2012 21:15:31 +0000 (23:15 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 5 Oct 2012 21:15:31 +0000 (23:15 +0200)
commit05eeaf320fa10168bb2e2cea57869e24c7dc9964
tree0cf62c82a8e12b63010f49b4ebab336e84e4d379
parent467d0227c4166243e81fb5a274e89ec58d77ae21
parent7ebd4931529e51cb35d2ad2f89d967660acba265
Merge branch 'master' of git.syncroton.org/Syncroton
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/tests/Syncroton/ServerTests.php