Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 May 2013 07:36:55 +0000 (09:36 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 May 2013 07:36:55 +0000 (09:36 +0200)
commit72b1c26910027b2066c75ee39e6d34f30fb4c2fb
treede45bc0c59a8879d767b61374e0ebdeef51d7d2d
parent5d5a7a53c3b694a9839bc8d4aec4da27a0629da2
parent248e6a2609304c36f0d0aa2deda87ac259d2e557
Merge branch 'master' into erp5-component