Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 4 Mar 2013 17:06:12 +0000 (18:06 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 4 Mar 2013 17:06:12 +0000 (18:06 +0100)
commitf9f1c61d3e72484a03c89a79fb8082bcf86a28b3
treedce95987612fd94623ff9dbcc2b12c062a98d00f
parentf76f23851287e8213f8d9c050d2e82734ca07b9e
parent0f8e52e72ab46334996303575262bf63f291a749
Merge branch 'master' into erp5-component