Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 21 Jun 2013 12:52:01 +0000 (14:52 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 21 Jun 2013 12:52:01 +0000 (14:52 +0200)
commit50f229bb74084d54d98946ec9e1147f00786964d
treef7723f87803cbffab5f6ac28bd8f230934cf61d4
parentc36a72fe97eaa1517da73bc16fa7c9bfd5de461a
parent796ec49d755d171c4ea2a687bd1a432982125cfd
Merge branch 'master' into erp5-component