[MERGe] base_calendar + trunk update
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 12 Dec 2012 17:55:58 +0000 (18:55 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 12 Dec 2012 17:55:58 +0000 (18:55 +0100)
commitdd319abcf00400286c72b5785fe0161c8d7ee70d
tree8e6f8049a31244d622d3a9da0a30b51e502d24fd
parent92750eadc01c7c458c16a79e49e1f5d2985a9f54
parent7b206d300458dd6c1b77f75e4af89e8ae593fb63
[MERGe] base_calendar + trunk update

bzr revid: qdp-launchpad@openerp.com-20121212175558-jr3n85u523yhcwvv