Skip to content
Snippets Groups Projects
Commit a57ee611 authored by Minh Tran's avatar Minh Tran
Browse files

fix merge crap 

bzr revid: mit@openerp.com-20120831133133-5u2jvawyn6xkth91
parent c0d5a806
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment