[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)
commit824e70c090d0ff0227a4727775792e99b200cad6
treebc4762782c465e44d201e72ed3b53f4dc67f230f
parent5c53da4c71590b76fb52540575e6b74aacdf4699
parent9f52ab382bff5a9b99b8eddf2c5a129eca671ee2
[MRG] merge with lp:openerp-web

bzr revid: tpa@tinyerp.com-20131111121021-6gl22x44n3nxg14f
bzr revid: tpa@tinyerp.com-20131122085429-9ee7ossuwtr494dz
bzr revid: tpa@tinyerp.com-20131126124409-yuuu0t7au7trd821