Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 11:11:48 +0000 (12:11 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 11:11:48 +0000 (12:11 +0100)
commit95de18d726a3323c1065260057825a806c7e5bb6
treeeec12556006bddf2a938ddf60d4415041a1795f0
parent4804a9f8d967badfbdd0c42d2ca21c38001b4e60
parentee0d136417d608d1c84066c43327994404595417
Merge branch 'erp5' into erp5-generic
setup.py