Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 11 Jul 2013 05:42:55 +0000 (14:42 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 11 Jul 2013 05:42:55 +0000 (14:42 +0900)
commit4faaff13c685ef0896b111909277ab28d6c6ae36
treeef25dffd5f996cdbc77cd0f6a740673dace6cf89
parent0afa6bdf210bf3cda433ecd13ff9de684b5c21ee
parent453cc58cbb21c11d55aa097aada44d4452e7f33b
Merge branch 'master' into erp5-component