[MERGE] Merged trunk.
authorJiten (OpenERP) <jra@tinyerp.com>
Mon, 5 Nov 2012 05:14:17 +0000 (10:44 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Mon, 5 Nov 2012 05:14:17 +0000 (10:44 +0530)
commit77dbc558cf2de8bd6013c82e1ae3e84d2e2f6a40
treecd84be4601dd49817df075722d2e65388f9c1e68
parent7184bd91515886ec8c2e4cddd163cba3658be781
parent74cda3df5bdf6be39358d804ea268401ee677401
[MERGE] Merged trunk.

bzr revid: jra@tinyerp.com-20121102111255-wu683od04sr9h8dg
bzr revid: jra@tinyerp.com-20121105051417-pa5spswlxg20xcqx
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/view_form.js
addons/web/static/src/xml/base.xml