Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 14 Mar 2014 09:10:51 +0000 (10:10 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 14 Mar 2014 09:10:51 +0000 (10:10 +0100)
commit37ab3f9b76827e87144cf25f219c63637105b3ed
treef8361ef43bd55197ac60e18efdaf1032ef991a08
parentb33d004e74cc20b686188d968c6169cc72fe7297
parentd75763de6cdec4e8071cdff15cef82af5fcf8068
Merge remote-tracking branch 'origin/master' into erp5-component