Merge branch 'master' into erp5testnode
authorŁukasz Nowak <luke@nexedi.com>
Thu, 10 Nov 2011 16:28:13 +0000 (17:28 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Thu, 10 Nov 2011 16:28:13 +0000 (17:28 +0100)
commit6c87c047dc8ff198cbc5f45f75c62aa2a23fce37
tree26e269727df9088ea55764ce7963448856bb485f
parent05cd5f07c0c06b0336b66681715db1d529b80f74
parent7d45a33834b0614f05ec821cf845df5e224ae622
Merge branch 'master' into erp5testnode

Conflicts:
stack/erp5.cfg