[MERGE] wiht lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Fri, 3 Dec 2010 12:11:31 +0000 (17:41 +0530)
committerjam-openerp <jam@tinyerp.com>
Fri, 3 Dec 2010 12:11:31 +0000 (17:41 +0530)
commit1a22a21ec1bb2a0720f231dbdf3b5667ad4ef160
tree39074f67a7cf809cb1185c94aa440e7819f59688
parenta499986bc71691dca25de5afa5007217531137e7
parent59aadd371a05750f2eeed3fbf6990ea26d886224
[MERGE] wiht lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: jam@tinyerp.com-20101203121131-0uzivf7ire89y2p2
addons/outlook/plugin/openerp-outlook-plugin/addin.py
addons/outlook/plugin/openerp-outlook-plugin/outlookaddin.iss