[MRG] merge with lp:openerp-web
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 22 Oct 2013 06:48:59 +0000 (12:18 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 22 Oct 2013 06:48:59 +0000 (12:18 +0530)
bzr revid: tpa@tinyerp.com-20131009094944-fi89d3le8o4nyf0l
bzr revid: tpa@tinyerp.com-20131015053957-9194qvus7u6xeyck
bzr revid: tpa@tinyerp.com-20131017124602-pps5ay9i3ofpm7x5
bzr revid: tpa@tinyerp.com-20131022064859-yqax7jm5d1cqceso


Trivial merge