Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 7 Mar 2013 13:43:06 +0000 (14:43 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 7 Mar 2013 13:43:06 +0000 (14:43 +0100)
commitf3c4c3f220ff83eac287fe9e60687a463eef1fe7
treeaadec11212df56516491475b47bbe5f6cde30d29
parentf13f9c096105f6e2eaed792095a3e3f1ee7cf27a
parent264414ce75095021010258d107e20919df92cc96
Merge branch 'master' into erp5-component