Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 10 Mar 2014 12:54:04 +0000 (13:54 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 10 Mar 2014 12:54:04 +0000 (13:54 +0100)
commit28c8a3c15667a3e5a9c28f2dcf17eb0b5a690d19
treedd515e40d4822703cb1c7d658be2d3f398f280a9
parent14adec734eb037062844db44b0568c112aa6e91b
parent9a14d202c6d9a3de17fd6553136caebbd225dca0
Merge remote-tracking branch 'origin/master' into erp5-component