Merge branch 'master' of http://git.syncroton.org/Syncroton
authorLars Kneschke <l.kneschke@metaways.de>
Mon, 10 Sep 2012 16:56:33 +0000 (18:56 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Mon, 10 Sep 2012 16:56:33 +0000 (18:56 +0200)
commitc06ac58a974be7bf6d97f9cb455c86434f78e7bc
tree771fe775241bdacd483dc1f7317f0ffbda57050d
parent54bae63a427d3b8c60bc1068de917d5809f01d35
parent2043866add1e6a8885a6d419e428f04a8722a02f
Merge branch 'master' of git.syncroton.org/Syncroton
tine20/library/Syncroton/lib/Syncroton/Command/Provision.php
tine20/library/Syncroton/lib/Syncroton/Command/Settings.php
tine20/library/Syncroton/lib/Syncroton/Model/DeviceInformation.php
tine20/library/Syncroton/tests/Syncroton/Command/ProvisionTests.php
tine20/library/Syncroton/tests/Syncroton/Command/SettingsTests.php