Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 4 Jan 2013 18:12:32 +0000 (19:12 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 4 Jan 2013 18:12:32 +0000 (19:12 +0100)
commit306c98eb758273cc4574666372e403181660970d
treea555b3fc007807882071c3f149ffd8778453b255
parent351f422e03aaa03346df5884d6c8b37244044fef
parent41bd498c7c5a3d7ace67d588f60815f9d720e3bf
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotonMerge
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php