Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 23 Apr 2014 14:53:31 +0000 (16:53 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 23 Apr 2014 14:53:31 +0000 (16:53 +0200)
commit51031106523e960184cece94a0888b9528e7c0c9
treee05657728014dcafeea174d728bfcae2613f84dd
parent0e8f3995c7e982db4b985a8093acda5088225a8f
parent7e9faa7b22bd9addff84e315c58853e23ee64035
Merge remote-tracking branch 'origin/master' into erp5-component