Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 27 Mar 2013 10:01:34 +0000 (11:01 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 27 Mar 2013 10:01:34 +0000 (11:01 +0100)
commit4bb6e3fddf64d6c80b35c86954a4118e93058f5e
tree3e1fca79fe2ecb302ce43cfae3728b3348346a4c
parent0c1d06b5beee528ce897678df0a9fb2247b7dd79
parent2c739e76c38273594f1b7021982bcf1d0c7bef45
Merge branch 'master' into erp5-component