[MERGE] Sync with trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 4 Mar 2014 15:55:35 +0000 (16:55 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 4 Mar 2014 15:55:35 +0000 (16:55 +0100)
commit14bd7add4b61c6c0e5779470d2c3099f083a8ccb
tree1cb8be7d35bdb8eba8c24ae621aa2cc00d2a1191
parent8a60839c6eff31b4174b33dc2b3ce4680b8b41d8
parent8ab5f3979bf40a953e1febca4c0b359623f9e2bb
[MERGE] Sync with trunk

bzr revid: rim@openerp.com-20140304155535-2d5tpkaxh57cjjq4