Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 5 Mar 2013 10:44:08 +0000 (11:44 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 5 Mar 2013 10:44:08 +0000 (11:44 +0100)
commit617f6abdf7c45eae25da9b84f01f8228388f82ab
treebd2a61c5c7ff750254071a2a00568657611242b2
parent0c37c5fe44259a9e12c4ce9521ac4243f3d52ce2
parentb3ab8a0643457e9d5f4434108792f0b06380f717
Merge branch 'master' into erp5-component