Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 21 Mar 2014 09:11:32 +0000 (10:11 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 21 Mar 2014 09:11:32 +0000 (10:11 +0100)
commitda5d9bb14b83b3cc29c2c13f6e80096eade7c666
treef09823e3d69d29bdbb22f355ccf6d6b3e4ddea8a
parentb1daa739f1fb506f3687371c239fa84236f9199a
parentbf80dfebdc59315ae2e55aac8f9262a8cf6ee7bc
Merge remote-tracking branch 'origin/master' into erp5-component