Merge branch 'master' of https://git.erp5.org/repos/slapos
authorAlain Takoudjou <talino@tiolive.com>
Tue, 8 Nov 2011 16:49:12 +0000 (17:49 +0100)
committerAlain Takoudjou <talino@tiolive.com>
Tue, 8 Nov 2011 16:49:12 +0000 (17:49 +0100)
commit2238a2e57d0526d5eb76281a62b16ca34fc8158f
treef213004c17ebe636c2d37b03c926eac187d81fa6
parente42fd1eb68aaa64a62f852838026c54e5e77e89b
parenta6eb7a6c68a06054a2d5f5ab715c341be79ed7f3
Merge branch 'master' of https://git.erp5.org/repos/slapos