Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 10 Feb 2012 20:23:59 +0000 (21:23 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 10 Feb 2012 20:23:59 +0000 (21:23 +0100)
commitb4a31d419d7a9f9d74e6f5a322bed4da6fbac7e2
treedba1e509f41cc6ac0523b4d2695349fbe93ada7a
parent6f279ee386de7195c55a731ab0a6d204568e8af4
parent9c3bb8a0c637ec159261e594ccc9a4fc67a95bf6
Merge branch 'master' of git.tine20.org/git/Syncope
tine20/library/Syncope/lib/Syncope/Data/Contacts.php
tine20/library/Syncope/lib/Wbxml/Decoder.php
tine20/library/Syncope/tests/Syncope/Command/SyncTests.php