Skip to content
Snippets Groups Projects
Commit ca2d1a1c authored by Martin Trigaux's avatar Martin Trigaux
Browse files

[MERGE] sync 

bzr revid: mat@openerp.com-20130621115631-9hsdpopro9enj5eu
parents 490a86d2 ff00a84d
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1394 additions and 927 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment