Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 29 Oct 2013 14:36:21 +0000 (15:36 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 29 Oct 2013 14:36:21 +0000 (15:36 +0100)
commit45ad486719e150fd46161eeef17c0e49c906e717
tree003080f0e0dddbb1a42fdd5ff01232ffc0bec71c
parent2a009e476d5428945eb0148cdaa587ea31bc43f7
parentfe3d9c6b2285a439278650a12d7ac39d94585992
Merge remote-tracking branch 'origin/master' into erp5-component