[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Wed, 27 Oct 2010 12:59:05 +0000 (18:29 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Wed, 27 Oct 2010 12:59:05 +0000 (18:29 +0530)
commitf5c8d4f9addc58761f80aab3150a914f090324fc
treeb6da85aec7c97c588c2f7c8d4856c48a0d52f92d
parent77f013e04683b201254f22fde826daa8112b578e
parent5640c5b96b96785c99c228a74009cea4ad7c6b9a
[MERGE]

bzr revid: hmo@tinyerp.com-20101027125905-4yxzzfs1y2colr0m
addons/survey/wizard/survey_answer.py
addons/survey/wizard/survey_send_invitation.py