Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Jul 2014 08:36:34 +0000 (10:36 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Jul 2014 08:36:34 +0000 (10:36 +0200)
commit58c437118eaddf44d1f80aac8c0efec538d93cfb
treebd652a4667737f361816eae341a7e0e0a4a694e6
parentb199e93f4893368e92aea13ca65cff75a0f76b8e
parent19536d9673badaa13eb39a914a5a0e41746a222d
Merge remote-tracking branch 'origin/master' into erp5-component