Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 4 Jan 2014 21:39:45 +0000 (22:39 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 4 Jan 2014 21:39:45 +0000 (22:39 +0100)
commit37427ee701c9bfebdddb59d17893b4f0e346673b
treeac3177d088e938f1b9cdf90b2d49a4376de04633
parent01a467f4c725baa4d8d827a4e28fe1e6778d6e44
parent8c0cac2d75553391293ae0c0baf888b2d8df9eb8
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg