Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Apr 2014 07:30:41 +0000 (09:30 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Apr 2014 07:30:41 +0000 (09:30 +0200)
commitbd4e7b4472e22d122e796e2ea6301bdaadb11f00
treec76f21e29b8c3b4043d0b5b2c09f3605d13b708a
parenta26f223fdca24a4030b239faf251f2039dfab11e
parent9ad59e62d3bcb34c98bd29f5b78e8f99146733c3
Merge remote-tracking branch 'origin/master' into erp5testnode