[MERGE] Merge with base branch tempalte-aja
authorjke-openerp <jke@openerp.com>
Thu, 7 Nov 2013 14:04:48 +0000 (15:04 +0100)
committerjke-openerp <jke@openerp.com>
Thu, 7 Nov 2013 14:04:48 +0000 (15:04 +0100)
bzr revid: jke@openerp.com-20131107140448-kp3daxcqvymdfy7r

1  2 
addons/base_calendar/base_calendar.py

Simple merge