Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotnMerge
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 21 Feb 2013 10:05:05 +0000 (11:05 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Thu, 21 Feb 2013 10:05:05 +0000 (11:05 +0100)
commit080b50f3447060ba00a54c2a2d2d9939ee315f26
treedca48d7a185fc20a1a70329a9b2de55158db5fa3
parentc10d2ae36a6f2fe25d00714ae6034e265a0e6d06
parent43809c1f51eedea508bff0c7e260fa8dd6fee1ee
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotnMerge

Conflicts:
scripts/packaging/debian/control
tine20/library/Syncroton/lib/Syncroton/Server.php