Merge remote-tracking branch 'origin/erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 6 Feb 2013 09:45:56 +0000 (10:45 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 6 Feb 2013 09:45:56 +0000 (10:45 +0100)
commitf085ff9c70836f1e4c92f29aad19eba0798cf939
treeb644d01e1401372172eedeb5ffaa703722bf755a
parentce292f067cef4a5fd09b9f5eab551e02b3a5feed
parent1eedf95a2dfa34ee80dc8ef66e38298a3a4c881c
Merge remote-tracking branch 'origin/erp5-component' into erp5