[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Tue, 9 Oct 2012 08:55:18 +0000 (14:25 +0530)
committerAmit Patel <apa@tinyerp.com>
Tue, 9 Oct 2012 08:55:18 +0000 (14:25 +0530)
bzr revid: apa@tinyerp.com-20121009085518-13itnqwf9ofb2k2c

1  2 
addons/survey/survey_view.xml

Simple merge