Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Tue, 25 Oct 2011 08:49:41 +0000 (10:49 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 25 Oct 2011 08:49:41 +0000 (10:49 +0200)
commit1437268c57b8362d967d830c1fbd0a1cac3c63cb
tree1ad52c453b80a01c9a747f7239d1800d2f23d849
parent8cfa4bc0dd3b2a1c4e538289b31d26bf13594263
parent4324b52e76411ea8aeafb51b5b0fd9e50e18c2f5
Merge branch 'erp5' into erp5-generic
stack/erp5.cfg