Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 May 2013 12:33:40 +0000 (14:33 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 May 2013 12:33:40 +0000 (14:33 +0200)
commit64882fa696c3786bfd2f8e2d094f24fd831a7609
treec7295e9139f2ad4454694b157a4cc5d9babe722c
parent87d0d1aafedbabed8cb29bade39ed0c71e72ffe5
parent192de42b4b03d50d4d296beb11cb8b4ef51afd19
Merge branch 'master' into erp5-component