Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 5 Mar 2013 17:31:55 +0000 (18:31 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 5 Mar 2013 17:31:55 +0000 (18:31 +0100)
commit9458fb4ccdd4268d093a3c7b2a34c475abdd239f
tree97ba18b980a6d9736b0b54e9033dcfc4cbcab0da
parent92bfb5cae238f6a6f28a2161dbb6ddcd821a2799
parent6382f6e89a73549b7008b42be7fc3a6baf8b0f7a
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg