Merge remote-tracking branch 'upstream/erp5' into upstreamerp5generic
authorRomain Courteaud <romain@nexedi.com>
Wed, 28 Dec 2011 09:07:43 +0000 (10:07 +0100)
committerRomain Courteaud <romain@nexedi.com>
Wed, 28 Dec 2011 09:07:43 +0000 (10:07 +0100)
commit2f23e0c8c39bddf7c03a9f4afcf7cf08b729361a
tree47b3d02bd1989acefc61a03b06675a281668c723
parentb58062c878f4d2ba6deec241f1650b47fdf35c2b
parent6a41df2303945d512f908765d4e0f475f6158481
Merge remote-tracking branch 'upstream/erp5' into upstreamerp5generic

Conflicts:
software/erp5/software.cfg
slapos/recipe/generic_zope_zeo_client/template/zope.conf.in
software/erp5/instance-erp5-development.cfg
software/erp5/snippet-master.cfg
stack/erp5.cfg