Merge remote-tracking branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 23 Sep 2013 11:29:52 +0000 (13:29 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 23 Sep 2013 11:29:52 +0000 (13:29 +0200)
commit45de9f4733022156056f98088811f4d5e26810c4
tree6637c034ab051c3bdb5df7cb947983f8c58c09df
parentbf6fc73e193c85dde1eb48cb619cf2563d94f321
parentb6dc23c7d7425fa87713d7b1aeef5fa5e664fcd8
Merge remote-tracking branch 'master' into erp5-component