Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 10 Feb 2012 16:33:20 +0000 (17:33 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 10 Feb 2012 16:33:20 +0000 (17:33 +0100)
commit6f279ee386de7195c55a731ab0a6d204568e8af4
tree858d809d2a61d60b11842bcf106b02474e50d2e1
parent4c5c3a1a3c3ae7aad3e0c5068eec4384d6c5a4c3
parentb823a214bf2c6b768d18790aca6ed99d9c0bc8c6
Merge branch 'master' of git.tine20.org/git/Syncope
tine20/library/Syncope/lib/Syncope/Backend/Content.php
tine20/library/Syncope/lib/Syncope/Backend/Device.php
tine20/library/Syncope/lib/Syncope/Command/FolderSync.php
tine20/library/Syncope/lib/Syncope/Command/Ping.php
tine20/library/Syncope/lib/Syncope/Command/Sync.php