Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 08:55:39 +0000 (10:55 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 08:55:39 +0000 (10:55 +0200)
commitb044b4cf43f1794f30475cc01e8c171096d811f6
tree14ebf714414378629c4d45a78641322442aa6cfb
parente5bcaf3c2f509b7ff03e1dd0db58ac3fcc1d4c75
parent742eb1025367f760ec82f69a031512a1f536dbcd
Merge remote-tracking branch 'origin/master' into erp5-component