Merge branch 'master' of http://git.syncroton.org/Syncroton into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 23 May 2013 07:54:55 +0000 (09:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 23 May 2013 07:54:55 +0000 (09:54 +0200)
commitabba8638897f945f24e908f845d6776372489e6b
tree3720853317b9df7933e303713b5868dfff3e422c
parentce0832ace83e6d29079e949d6973b567a3fed74e
parent05c33c1a7b9b13a7184d5cf0b8d1e18acd16d99c
Merge branch 'master' of git.syncroton.org/Syncroton into 2013.03
tine20/library/Syncroton/lib/Syncroton/Server.php