[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Mon, 12 Aug 2013 07:58:53 +0000 (09:58 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 12 Aug 2013 07:58:53 +0000 (09:58 +0200)
commitbf09b267a082597707d9c906990a0ac8a7ebfeb6
tree934bda04f372342056184898b6559cad4af17c27
parent39cb3e44b1dab3b2b6e99e5c819e4b8f2f324a9a
parent50c17d4b5410decca8240f84cc2bfe8121cfbf68
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130812075853-d12p01w8a5h0ez6w