Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 8 Apr 2014 12:14:39 +0000 (14:14 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 8 Apr 2014 12:14:39 +0000 (14:14 +0200)
commitda9c1aa4bf5b23a7a11fb2a78b921f83d016bb1d
tree4074e960277ad39a1f104e60bb309f141eaee6b1
parent9281501a39e767140e5d5c385bc10ea8f40f0372
parentb08435205cd3749bc8dcee4e6ab78c64b4a0e17f
Merge remote-tracking branch 'origin/master' into erp5-component