Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 15 Mar 2013 08:25:36 +0000 (09:25 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 15 Mar 2013 08:25:36 +0000 (09:25 +0100)
commita7eaea51905814d4262277c6fa60da647f75f15d
tree1e847244795a3807e8ffef482ffd62a7a75bb5e7
parent492ee3a1fe3cf2b80e11c59d11a095e2eca9ca01
parente6cce9da68214cf43aaa5419731d8d2bc59eb426
Merge branch 'master' into erp5-component