Merge branch 'master' of https://git.erp5.org/repos/slapos
authorAlain Takoudjou <talino@tiolive.com>
Thu, 27 Oct 2011 16:50:15 +0000 (17:50 +0100)
committerAlain Takoudjou <talino@tiolive.com>
Thu, 27 Oct 2011 16:50:15 +0000 (17:50 +0100)
commited3c83a34c2fe2296182663a08c51fa9ce04ac4d
treeccd6baededbdb65b3b47a876d0be69673bb3d4ec
parentbdf2907a24c6a6f6005e16c1422db1ba9a664384
parent116d2e36f2d9477dab2d5f7e4b763edaa2abe59e
Merge branch 'master' of https://git.erp5.org/repos/slapos