Merge branch 'lamp' of https://git.erp5.org/repos/slapos into lamp
authorAlain Takoudjou <talino@tiolive.com>
Tue, 25 Oct 2011 13:45:27 +0000 (14:45 +0100)
committerAlain Takoudjou <talino@tiolive.com>
Tue, 25 Oct 2011 13:45:27 +0000 (14:45 +0100)
commitc316150d25a091d2b2ad4c577ce8cbef2ae9b57a
tree7c9bbc902ed96d36cf7c6f097094c05950d65a61
parent8451cba82ebb813c2d88e692eca11ae841af1eed
parentda5f2dc9d8ecddbc8c846ad96f00acbf142d13d5
Merge branch 'lamp' of https://git.erp5.org/repos/slapos into lamp