Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 31 Jan 2012 16:20:26 +0000 (17:20 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 31 Jan 2012 16:20:26 +0000 (17:20 +0100)
commit749584bac497a1da237d58d8ec7e6a509fbd7298
tree3753d202a55bb7a7704383f8b25c1d0141fadfcf
parent06e12ab2a3f88fa9816377fdc314503c7a035ea2
parentf0b8aeae4fd07980839c3d3fc9fa6e779ab789d4
Merge branch 'master' of git.tine20.org/git/Syncope
tine20/library/Syncope/lib/Syncope/Backend/Device.php
tine20/library/Syncope/lib/Syncope/Backend/IDevice.php
tine20/library/Syncope/lib/Syncope/Model/IDevice.php
tine20/library/Syncope/lib/Syncope/Server.php