Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 22:15:04 +0000 (23:15 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 22:15:04 +0000 (23:15 +0100)
commit153b8331dbc214c5c7e87c612461180a473974ff
tree4787ef04b0568140c35a483d57ad615ded3e497d
parent8ffe979105ba949e2505ddc08cd6510f80e9a408
parentaa467f0fa7ffed36a44a89ad7b9a3184e55044ea
Merge branch 'master' into erp5-component