Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 4 Jan 2013 17:18:38 +0000 (18:18 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 4 Jan 2013 17:18:38 +0000 (18:18 +0100)
commit351f422e03aaa03346df5884d6c8b37244044fef
tree41ab9612a18c8983b23f589441f2076349829c55
parent706db58821ae04fa27a920140804d73166744737
parent0bc1c3b97ea364ec27337bd951cb33128f605051
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotonMerge
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Abstract.php