Skip to content
Snippets Groups Projects
Commit bb6f654c authored by Christophe Simonis's avatar Christophe Simonis
Browse files

merge upstream 

bzr revid: chs@openerp.com-20121126122321-r1oezjyb8irepiyi
parents bec3abd6 cd9f7171
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 155922 additions and 121451 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment