Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 15 Mar 2013 08:23:21 +0000 (09:23 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 15 Mar 2013 08:23:21 +0000 (09:23 +0100)
commite6cce9da68214cf43aaa5419731d8d2bc59eb426
tree1e847244795a3807e8ffef482ffd62a7a75bb5e7
parent7d4cf81902155d6af298234faad35db8c866e6d4
parent4e5f24a9eccc8caca2f2108036610cc6d3dbe1d3
Merge branch 'erp5'