Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 30 Apr 2013 07:29:34 +0000 (09:29 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 30 Apr 2013 07:29:34 +0000 (09:29 +0200)
commit561ffa4842d3ec6911eb676aa54b8fa705a09957
tree8fba5f47a98d2588639e86bc4a37f53cdedd01af
parent0d105d0e3df7b5c747253f751d3311b27026274a
parentbb6746ed94e4dffe2ba5223632793ea3a9d3b33f
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg