Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 24 Sep 2013 08:48:33 +0000 (10:48 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 24 Sep 2013 08:48:33 +0000 (10:48 +0200)
commit000da518f0f9faec4828484fed0d32afb8daa8bb
tree44daa09bf9e7d18f588441679872bda1f900c3d1
parent138381d20b7ee4a3c6cb455cbfaa4770294ec3ce
parentd82a3efb4277de7b1cd707e929ac1f978c7cb23c
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg