Merge remote-tracking branch 'origin/master' into slapos-testing
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 6 Sep 2012 15:25:56 +0000 (15:25 +0000)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 6 Sep 2012 15:25:56 +0000 (15:25 +0000)
commit962aff920383b012e110e43cb15fd7743beb2ed5
tree6c9de2dddfd78107daf6c2d2f2a2547bb81d4b9d
parent7845f117f7f6e28050cf6c7fb30de47ded658e50
parent73b5e348a94073cb2959635ba6ed6791d13418f0
Merge remote-tracking branch 'origin/master' into slapos-testing

Conflicts:
setup.py
setup.py
software/cloudooo/software.cfg
stack/erp5/buildout.cfg