[MERGE] staging branch with fixes, again, on base_calendar and virtual ids
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 12 Dec 2012 18:38:07 +0000 (19:38 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 12 Dec 2012 18:38:07 +0000 (19:38 +0100)
commit4c1ead2a1c454a541eef1aeff35a6f31fe08dd05
treeca58c663b62e8a45afb30bd244aa3e572e010161
parent26cfe040cb7c775374e9f84040cfe2e5f8f23564
parentdd319abcf00400286c72b5785fe0161c8d7ee70d
[MERGE] staging branch with fixes, again, on base_calendar and virtual ids

bzr revid: qdp-launchpad@openerp.com-20121212183807-7197dwwml3m93fs4