Fix merge from erp5 to master: lxml egg
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 15 Aug 2012 17:44:42 +0000 (19:44 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 15 Aug 2012 17:44:42 +0000 (19:44 +0200)
commit9b1ca751f34ac648453a22c6d3fac177578be651
tree87782065a6590da77f574d679c1fffb00f29366d
parent2df783fa823e24ff7767c654c610a5086f8b6f4e
Fix merge from erp5 to master: lxml egg
stack/slapos.cfg