Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 17 Jun 2014 18:41:22 +0000 (20:41 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 17 Jun 2014 18:41:22 +0000 (20:41 +0200)
commit3422b8fa1dbbd3ae235a94c8588b204de51972d7
tree196d0799a815b97b377c5f1bb6a75b93a1ec40f4
parent4aa021e0c095bd1b64fe4eac8fdda388c6a13ebb
parente2f33e64b960643813f315ff5456f58c108f6735
Merge remote-tracking branch 'origin/master' into erp5-component