Merge branch 'master' into erp5-component
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 9 Jul 2012 10:11:03 +0000 (12:11 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 9 Jul 2012 10:11:03 +0000 (12:11 +0200)
commitc38bbae5abb336338fc1debea459dc7fc9cbd105
treec817b372058ba27da01db90144272e22a9abc223
parent7a144a1cf05ab7ef74b4130e05f0f5fd4c312858
parent63778a116a7df7777c64ca05d55cb379b5bf6e04
Merge branch 'master' into erp5-component
setup.py
stack/slapos.cfg