[MERGE] merge with main web
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 23 Oct 2012 10:05:28 +0000 (15:35 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 23 Oct 2012 10:05:28 +0000 (15:35 +0530)
commita10c7b882b498fdfe2d84700fde65102783a14f0
treecd2b2b19abf0647f15f6fa41110dbf749a2ce169
parent36cc003dc8dd9bb05b64e82753dad66a5bef95ce
parent9bf9ca7a67a16b83cfa371c1377865e168d6c7dc
[MERGE] merge with main web

bzr revid: psi@tinyerp.com-20121023100528-w5z1yf2yj6cq1edj
addons/web/static/src/js/view_list.js
addons/web/static/src/xml/base.xml