[MERGE]
authorjam-openerp <jam@tinyerp.com>
Wed, 3 Nov 2010 11:16:31 +0000 (16:46 +0530)
committerjam-openerp <jam@tinyerp.com>
Wed, 3 Nov 2010 11:16:31 +0000 (16:46 +0530)
commit76d8adfad5c886ff5b7c8da05906efd4916dadb5
treeeb781fb9a11b159e830af6a8772541232bf23cc8
parented284141e2a179f0078cfa238a57a1e5e2df6ddd
parent30182d8a77e9ead545ea05aca3fbe1654ec97cb0
[MERGE]

bzr revid: jam@tinyerp.com-20101103111631-5jq8gtwygbrbsn3n
addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py