[MRG] merge with lp:openerp-web
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 4 Dec 2013 09:08:25 +0000 (14:38 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 4 Dec 2013 09:08:25 +0000 (14:38 +0530)
bzr revid: tpa@tinyerp.com-20131204090825-b0mkszfp49oe3rb4


Trivial merge