Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 09:40:58 +0000 (10:40 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 09:40:58 +0000 (10:40 +0100)
commit2f548b8521ae73c97f33f685f4828cb3a03a7f8c
tree71e8c00bfb6ada4a5fc9780ccc6987e02afb1af7
parent3079639098b971c06a2ac180373bfaccfe9f18b6
parentf5a84e499f1ae37c27edea21a08e71f024d42c63
Merge branch 'erp5' into erp5-generic

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