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

merge upstream

bzr revid: chs@openerp.com-20121201003326-j6n5r8juz16752j5
bzr revid: chs@openerp.com-20121204165557-u1oxocye3la4r6gf
bzr revid: chs@openerp.com-20121205143722-olswf8gsg8mhref3
parents 3ff3f1f8 8dbee5c4
No related branches found
No related tags found
No related merge requests found
Showing
with 21577 additions and 5862 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment