Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Oct 2013 07:41:11 +0000 (09:41 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Oct 2013 07:41:11 +0000 (09:41 +0200)
commitbb55ce61c296b0b197951a7560dda59fd155753c
treed21583a29f83e8a4204e856e48b1db8b80ad1f4b
parent1c985f2ff294b5e5cfcac8be04262200a4d43c21
parent94b0ad8de280aa79d69702dbdb82fd89f6998a46
Merge remote-tracking branch 'origin/master' into erp5-component