Merge branch 'erp5' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 10 Sep 2013 14:14:27 +0000 (16:14 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 10 Sep 2013 14:14:27 +0000 (16:14 +0200)
commit0885ff2fea38397fbf47a5ffc34ddf8d0a121784
tree3980ca5229bbe7a1eada9e6bfeee1ca6f0b17fa3
parent48eea0477a4a37159c0ec79b53a1e329e5f7b52c
parent138381d20b7ee4a3c6cb455cbfaa4770294ec3ce
Merge branch 'erp5' into erp5-component
stack/erp5/buildout.cfg