[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sat, 29 Jun 2013 23:00:38 +0000 (01:00 +0200)
committerAntony Lesuisse <al@openerp.com>
Sat, 29 Jun 2013 23:00:38 +0000 (01:00 +0200)
commitf585a2d457b928929b050f6c2cd16ccb437b1b98
tree580151ad8ecfead65d667321e1803f89fd775204
parentffb411912083a01ae0c7b7a4e2357a7e54e0a194
parentfc70550ca2a8d34c07b05b465f342f6248da10ed
[MERGE] trunk

bzr revid: al@openerp.com-20130629230038-9bfrcmlpspcwbf2z