[MERGE]
authorThibault Francois <tfr@openerp.com>
Thu, 20 Jan 2011 11:46:05 +0000 (12:46 +0100)
committerThibault Francois <tfr@openerp.com>
Thu, 20 Jan 2011 11:46:05 +0000 (12:46 +0100)
commit7a352a05286ecd4288b6f3508f958575714f42c6
tree26246f54a0d5f8c38531e1982db0b5d327244172
parent83d4a5d981f21ae5ca087d270091f8226925d179
[MERGE]

bzr revid: tfr@openerp.com-20110120114605-hhm706qwco5gma8v
addons/base_calendar/base_calendar.py