[MERGE] with trunk-survey2-rim
authorDharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Mon, 3 Feb 2014 05:07:52 +0000 (10:37 +0530)
committerDharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Mon, 3 Feb 2014 05:07:52 +0000 (10:37 +0530)
bzr revid: dizzy.zala@gmail.com-20140203050752-mu2067skmaxivk51

1  2 
addons/survey/survey.py

Simple merge