Merge remote-tracking branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 29 May 2013 09:34:15 +0000 (11:34 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 29 May 2013 09:34:15 +0000 (11:34 +0200)
commit4ce379b1f6da44f4b52c24fe4cd4f7b4a29e0307
tree80c0266084d894063ba7428443ba2ff3384e3c23
parent53102c004192fc976753bd83992b63e8126210d8
parent181cffc2fe0c9c62dcf0f3cc02285dadc518ef19
Merge remote-tracking branch 'master' into erp5-component