[MERGE] Merge parents
authorRichard Mathot (OpenERP) <rim@openerp.com>
Mon, 30 Dec 2013 10:15:09 +0000 (11:15 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Mon, 30 Dec 2013 10:15:09 +0000 (11:15 +0100)
commitf14b77d9fd9cc0c2b238d0439891eac7ead9d8b8
tree227454d94d198e2c4c19c084a091dcd464b7b6d7
parent4394fde33bca18a6b151f536063a7ef136d470ea
parent315da9c80989198f8aaf9f0921ea93707f2ebd89
[MERGE] Merge parents

bzr revid: rim@openerp.com-20131230101509-6pl32yp5cboay06r