[MERGE] staging branch
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 20 Dec 2012 08:43:57 +0000 (09:43 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 20 Dec 2012 08:43:57 +0000 (09:43 +0100)
commit4d7a6ac69f52013d94cc07cd6ba61d7e35ac22a8
tree086acd7718ecb164680392a23def5e919da7c9d4
parent2315050bab19cd1ec7e087a6751c3ca96d6c34e6
parent319908f1f69908a8a4670760e9c9c86f753818cb
[MERGE] staging branch

bzr revid: qdp-launchpad@openerp.com-20121220084357-3ae9icaqihfxpmcs