Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 12 Feb 2014 12:21:22 +0000 (13:21 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 12 Feb 2014 12:21:22 +0000 (13:21 +0100)
commit34c3a673881520f05a5eb2ca952eaa5d8cfe4551
tree934bf9d030adc9df61289e76507dbe6d772883b7
parentf9fafb3877537be8f5b609bccdad8fd7d8911315
parentc7839354050c465f755b6dbf280484bb332e07ef
Merge remote-tracking branch 'origin/master' into erp5-component