[MRG] merge with lp:openerp-web
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 26 Nov 2013 12:44:09 +0000 (18:14 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 26 Nov 2013 12:44:09 +0000 (18:14 +0530)
bzr revid: tpa@tinyerp.com-20131111121021-6gl22x44n3nxg14f
bzr revid: tpa@tinyerp.com-20131122085429-9ee7ossuwtr494dz
bzr revid: tpa@tinyerp.com-20131126124409-yuuu0t7au7trd821


Trivial merge