Merge remote-tracking branch 'origin/erp5-generic' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Wed, 25 Jan 2012 13:17:11 +0000 (14:17 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Wed, 25 Jan 2012 13:17:11 +0000 (14:17 +0100)
commit5fa370b577ce48162c87b90c93b24dc2c3a15836
tree70be9555c74c4494584c4ac4cc9a8f8daf4ed118
parent503a5546df4b5a20c4ad13341d4f5746b41b8ebd
parent6bf658d8660c8abacc2eb00d6de2585a02ea1073
Merge remote-tracking branch 'origin/erp5-generic' into erp5

Conflicts:
slapos/recipe/erp5/__init__.py
stack/erp5.cfg