Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 6 Mar 2013 14:26:28 +0000 (15:26 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 6 Mar 2013 14:26:28 +0000 (15:26 +0100)
commit394a805f12f7809272328d4f6e0a988451e2fa81
tree3125b0c081c662a50386bd288306e29c8f17c10f
parentbfaf833c2e7988596b2a766acc870fe267f495a5
parentaae99e196fb6dd7b73182e38aa34a7a22a3b2416
Merge branch 'erp5'