[MERGE] Merge with trunk upto revison no 1256.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Fri, 14 Oct 2011 04:58:39 +0000 (10:28 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Fri, 14 Oct 2011 04:58:39 +0000 (10:28 +0530)
commit0a89e5f6277011d3ef000e2f28eddd5e0b2b0040
tree9d98a4512e65366fd3c23e6a7d2d5ed9ad7fd011
parent89a7c1cdaf6963c4906764adbed22659e1ebda69
parent7b5b9d45ad26e47539504f19c00ad387569925e3
[MERGE] Merge with trunk upto revison no 1256.

bzr revid: ysa@tinyerp.com-20111014045839-rc5gvd0crl20pjqv
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml