Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 18 Jul 2013 23:17:58 +0000 (08:17 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 18 Jul 2013 23:17:58 +0000 (08:17 +0900)
commit3aec1a5648d9b38b58d74c0a370e2af003510267
treeb560921ccc297018872b2ffc090b58c21ab07a0d
parent7ce4fdd62e41209e6a3d25132de0c97fa4c9f738
parentbe492279ae1f5e793c638da14599709767650414
Merge branch 'master' into erp5-component