Merge branch 'erp5'
authorGabriel Monnerat <gabriel@tiolive.com>
Mon, 16 Sep 2013 07:50:49 +0000 (09:50 +0200)
committerGabriel Monnerat <gabriel@tiolive.com>
Mon, 16 Sep 2013 07:50:49 +0000 (09:50 +0200)
commit8477e0fbcb31783c4155f4c67d3586201aebbd55
tree2b898ecfd4033a30a3b7a2b9d3a3afdf6b7b75c8
parent30ab28925cb6a649f7efe1bc5fe59dbbf7e99c57
parent138381d20b7ee4a3c6cb455cbfaa4770294ec3ce
Merge branch 'erp5'