[MERGE] Merge parents
authorRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 24 Dec 2013 16:00:05 +0000 (17:00 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 24 Dec 2013 16:00:05 +0000 (17:00 +0100)
commit699453f52eb7a36cdc5d0462b0413232dd00778d
tree90fc2901a5477164c3378dc5d3e8a94b009d44b1
parenta4cc8618f577cb4ece754f3afad522d9f25076f3
parentc1fb818999fb3031190a51e1c58048c8c4c2533b
[MERGE] Merge parents

bzr revid: rim@openerp.com-20131224160005-xjwwptj9bdq3ys0p