Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 20 Nov 2013 08:32:50 +0000 (09:32 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 20 Nov 2013 08:32:50 +0000 (09:32 +0100)
commitd3c04864cd0d6e598e1aff0b4d60ed1dda35788d
tree1f6732aeb7c4c5fad7429b5c94c34e76c5ec41fb
parentda35e513bb80cbf3af379996f35476d3e85537a2
parent0e4a69f29bb21988fb2168e9054af4dd1c6f3a3b
Merge branch 'erp5-component' into erp5