Merge remote-tracking branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 5 Jun 2013 09:26:53 +0000 (11:26 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 5 Jun 2013 09:26:53 +0000 (11:26 +0200)
commitec4df2af3993d11d9e14cdbe4e68affd66ed48d0
tree2d0b1023cd51b07fa1b608ce8aa661e1dcb6a9a3
parent9fecbb51ee9939df2a454ad5ba1e0b10bf053f6a
parentf4e4d55a5dcc38be795db8260509dd458ac54736
Merge remote-tracking branch 'master' into erp5-component