Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 22:13:57 +0000 (23:13 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 22:13:57 +0000 (23:13 +0100)
commitaa467f0fa7ffed36a44a89ad7b9a3184e55044ea
treede621e2a856c64a06da17b5f291c1ec4cf3278f2
parentcd38076ec221b4f0a97d1154df1c2c13305fa8b4
parent8a7291cf4f934a6a63bb671451553f7a4c53b6d4
Merge branch 'erp5'