[MERGE]:lp:~openerp-dev/openobject-addons/trunk-event-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 10:05:59 +0000 (15:35 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 10:05:59 +0000 (15:35 +0530)
commitdfd7a7412f0371210737fcf9b0cda4f0d635ff35
tree892a5271aa0d85a8d9869a66d26c7a486fceadb5
parent58072c6c34be60634888102b2e421ab4c3139937
parent24d5c94bb9635feddab4d876835ae781a922762c
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-event-topbar-tpa

bzr revid: apa@tinyerp.com-20120426100559-oomxj9szeftf1xsc