[MERGE] with trunk-survey2-rim addons branch
authorDharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Tue, 25 Feb 2014 05:32:04 +0000 (11:02 +0530)
committerDharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Tue, 25 Feb 2014 05:32:04 +0000 (11:02 +0530)
commitc6917b9c074f3f2c19cac1dc3e05c8a3d2cadbed
tree6a17e259f27e029458207671d10fec50b5c425be
parentb2688a37f84a505d8e334f8b0325b4747d440170
parent9eb2db4465cefa5dc331123c1b0a4df035545015
[MERGE] with trunk-survey2-rim addons branch

bzr revid: dizzy.zala@gmail.com-20140225053204-mra08nfvumkxyixa
addons/survey/__openerp__.py
addons/survey/survey.py